Skip to content
This repository has been archived by the owner on Apr 4, 2019. It is now read-only.

lazy rebase #9

Open
wants to merge 437 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
437 commits
Select commit Hold shift + click to select a range
7479a1a
Automatic changelog generation for PR #39412 [ci skip]
tgstation-server Jul 28, 2018
d9a7543
makes mood graphics more subtle (#39393)
Mickyan Jul 28, 2018
755f33d
Automatic changelog generation for PR #39393 [ci skip]
tgstation-server Jul 28, 2018
7d2c657
Rebalances syndicate and pirate simple animals take two! (#39424)
WJohn Jul 28, 2018
1f5f8e1
Automatic changelog generation for PR #39424 [ci skip]
tgstation-server Jul 28, 2018
1c51b9f
Automatic changelog compile, [ci skip]
tgstation-server Jul 28, 2018
f8ee00e
Circuitry Nerfs (#39376)
Garen7 Jul 28, 2018
b70f1e2
Automatic changelog generation for PR #39376 [ci skip]
tgstation-server Jul 28, 2018
0f3b00e
Add Spawn Ruin debug verb
SpaceManiac Jul 28, 2018
4778196
Merge pull request #39401 from Jared-Fogle/nocanvas
Cyberboss Jul 28, 2018
142622a
Automatic changelog generation for PR #39401 [ci skip]
tgstation-server Jul 28, 2018
d6a4f09
Merge pull request #39407 from 81Denton/arrivals-toss
Cyberboss Jul 28, 2018
a0189c0
Automatic changelog generation for PR #39407 [ci skip]
tgstation-server Jul 28, 2018
638e52b
Merge pull request #39409 from 81Denton/unzips-fedora
Cyberboss Jul 28, 2018
b8fc164
Automatic changelog generation for PR #39409 [ci skip]
tgstation-server Jul 28, 2018
005e61d
Merge pull request #39400 from McBawbaggings/yoyoSMESfix
Cyberboss Jul 28, 2018
3e2c9c4
Automatic changelog generation for PR #39400 [ci skip]
tgstation-server Jul 28, 2018
9407bd0
Merge pull request #39410 from Mickyan/social_anxiety_tweaks
Cyberboss Jul 28, 2018
8cd5e10
Automatic changelog generation for PR #39410 [ci skip]
tgstation-server Jul 28, 2018
eae262f
Merge pull request #39396 from AnturK/smokehref
Cyberboss Jul 28, 2018
f71a1f1
Check that rust_g's API file matches the in-tree copy
SpaceManiac Jul 22, 2018
5d4b05e
Merge pull request #39336 from Cyberboss/BSQLUpdate
optimumtact Jul 29, 2018
0f48a6f
Merge pull request #39277 from AutomaticFrenzy/patch/rustg-api-file
optimumtact Jul 29, 2018
55f4cce
Merge pull request #39258 from AnturK/plasmaburn
optimumtact Jul 29, 2018
9e4df6a
Adds PENLITE holobarriers (#39344)
ExcessiveUseOfCobblestone Jul 29, 2018
4fd4ece
Automatic changelog generation for PR #39344 [ci skip]
tgstation-server Jul 29, 2018
a72eeca
Exotic Corgis 2 Electric Boogaloo (#39319)
fluffe9911 Jul 29, 2018
61e4381
Merge pull request #39298 from 81Denton/roundstart-robotics
optimumtact Jul 29, 2018
66f74c5
Automatic changelog generation for PR #39298 [ci skip]
tgstation-server Jul 29, 2018
69832ae
Merge pull request #39386 from Anonmare/patch-8
optimumtact Jul 29, 2018
19e2cfe
Automatic changelog generation for PR #39386 [ci skip]
tgstation-server Jul 29, 2018
baa1e2c
Add moth week as a holiday (#39377)
Mothblocks Jul 29, 2018
dcde29b
Automatic changelog generation for PR #39377 [ci skip]
tgstation-server Jul 29, 2018
26c1031
Refactors create_mob_hud() to add a signal (#39364)
ninjanomnom Jul 29, 2018
c5ce562
Adds Pulse Multiplexer Circuits (#39417)
Jul 29, 2018
9b519b7
Automatic changelog generation for PR #39417 [ci skip]
tgstation-server Jul 29, 2018
ad5bba4
Minor fixes for delta and box white ships. (#39423)
WJohn Jul 29, 2018
cbcf41a
Increases handheld T-ray scanner range (#39427)
81Denton Jul 29, 2018
8d2efca
Automatic changelog generation for PR #39427 [ci skip]
tgstation-server Jul 29, 2018
03e6bf6
Removes cargo bounties that request irreplaceable items (#39431)
81Denton Jul 29, 2018
5478199
Automatic changelog generation for PR #39431 [ci skip]
tgstation-server Jul 29, 2018
02d7a94
Fix BM Speedwagon offsets (#39419)
Jul 29, 2018
59c2aaa
Automatic changelog generation for PR #39419 [ci skip]
tgstation-server Jul 29, 2018
b7fbcbb
Adds Uncrossed to forceMove (#39434)
ninjanomnom Jul 29, 2018
8a6a1a5
Automatic changelog generation for PR #39434 [ci skip]
tgstation-server Jul 29, 2018
8f71d71
Fix more spelling/grammar (#39450)
Jul 29, 2018
e5b26bf
Add round ID to round-end report
SpaceManiac Jul 30, 2018
ffc0a2d
Improve supply remote desc (#39429)
81Denton Jul 30, 2018
48f3b9c
Add pixel offsets to directional APC/air alarm subtypes (#39432)
81Denton Jul 30, 2018
c79aa1f
Allow security to eject from gulag shuttle sheet stacker
SpaceManiac Jul 30, 2018
0e43ed3
Fix wonky blood overlays on awakened His Grace
SpaceManiac Jul 30, 2018
52eca1a
Combine fire immunity suit/helm temperature defines
SpaceManiac Jul 30, 2018
c67a698
Meta whiteship redesign (#39438)
WJohn Jul 30, 2018
4be9a13
Automatic changelog generation for PR #39438 [ci skip]
tgstation-server Jul 30, 2018
ee4f00d
Speed up VV searching
SpaceManiac Jul 30, 2018
a0b1b82
Automatic changelog compile, [ci skip]
tgstation-server Jul 30, 2018
2940270
Add four more bounties (#39421)
81Denton Jul 30, 2018
2e6fefb
Automatic changelog generation for PR #39421 [ci skip]
tgstation-server Jul 30, 2018
085dff4
Indestructible turfs don't get destroyed by singularities (#39448)
MMMiracles Jul 30, 2018
f11f292
Merge pull request #39433 from AutomaticFrenzy/patch/spawn-ruin
optimumtact Jul 30, 2018
8ca6a80
Triples the price on the bee grenade bundle. (#39420)
Iamgoofball Jul 30, 2018
101bf4a
Automatic changelog generation for PR #39420 [ci skip]
tgstation-server Jul 30, 2018
7df3ffb
Fixes various small issues with moodlets; adds one for exercise. (#39…
Jul 30, 2018
86b578a
[READY] Incinerator clean up and update (#39299)
granpawalton Jul 30, 2018
8d2ea1b
Automatic changelog generation for PR #39299 [ci skip]
tgstation-server Jul 30, 2018
b74535a
Merge pull request #39461 from AutomaticFrenzy/patch/round-end-id
optimumtact Jul 31, 2018
2552190
Fix some weird syntax
SpaceManiac Jul 31, 2018
8044054
Add the half-life security guard outfit to the secdrobe (#39460)
barbedwireqtip Jul 31, 2018
6b82cf7
Automatic changelog generation for PR #39460 [ci skip]
tgstation-server Jul 31, 2018
02ef76d
Update _drone.dm (#39463)
ExcessiveUseOfCobblestone Jul 31, 2018
15805a1
Automatic changelog generation for PR #39463 [ci skip]
tgstation-server Jul 31, 2018
1463784
Adds tiny circuits (#39123)
Jul 31, 2018
e85177e
Automatic changelog generation for PR #39123 [ci skip]
tgstation-server Jul 31, 2018
be7d1b8
Sliding puzzle improvements (#39471)
AnturK Jul 31, 2018
d9fca34
Fix sparks cooling air (#39476)
81Denton Jul 31, 2018
5fbca57
Fix a typo in scrapheap shuttle description (#39480)
Amelia0010 Jul 31, 2018
59023c4
[READY] Agent Stealth Box / Stealth Manual (#39302)
Jul 31, 2018
9cc6815
Automatic changelog generation for PR #39302 [ci skip]
tgstation-server Jul 31, 2018
3638e59
Fix nuke rounds not ending when nuke was disarmed (#39440)
AnturK Jul 31, 2018
df0f4bd
Turning circuits literate (#39223)
Shdorsh Jul 31, 2018
436d07c
Automatic changelog generation for PR #39223 [ci skip]
tgstation-server Jul 31, 2018
c5ac66a
Merge pull request #39466 from AutomaticFrenzy/patch/his-grace
optimumtact Jul 31, 2018
fbaedee
Merge pull request #39467 from AutomaticFrenzy/patch/fire-immunity
optimumtact Jul 31, 2018
823f845
Merge pull request #39469 from AutomaticFrenzy/patch/vv-sanic
optimumtact Jul 31, 2018
eba2edf
Merge pull request #39465 from AutomaticFrenzy/patch/laborstacker
optimumtact Jul 31, 2018
3f6f9e6
Automatic changelog generation for PR #39465 [ci skip]
tgstation-server Jul 31, 2018
5e20350
Skip the map merger on merge commits (#39495)
SpaceManiac Jul 31, 2018
6fa2dcf
Multiple Color Clown Costumes! (#39435)
fluffe9911 Aug 1, 2018
d455eb1
Fix link to rust-g repo
octareenroon91 Aug 1, 2018
20264ea
Correct PENLITEs not being techweb spawnable (#39478)
ExcessiveUseOfCobblestone Aug 1, 2018
8ad18cc
Automatic changelog generation for PR #39478 [ci skip]
tgstation-server Aug 1, 2018
d42b94e
Fixes exo reactor rads, changes SSU desc (#39479)
81Denton Aug 1, 2018
47f5cf8
Automatic changelog generation for PR #39479 [ci skip]
tgstation-server Aug 1, 2018
3f8dbf2
Emitter gun mounts (#39367)
Time-Green Aug 1, 2018
aea2b5a
Automatic changelog generation for PR #39367 [ci skip]
tgstation-server Aug 1, 2018
305e5c2
Merge pull request #39500 from octareenroon91/patch-58
optimumtact Aug 1, 2018
a93dfb4
Fixes sentient disease IsSame check.
AnturK Aug 1, 2018
5b5e1ee
Third time's the charm - Photography update: 7x7 cameras, photo loggi…
silicons Aug 1, 2018
7dc8c57
Automatic changelog generation for PR #38944 [ci skip]
tgstation-server Aug 1, 2018
ae80ca5
Automatic changelog compile, [ci skip]
tgstation-server Aug 1, 2018
826c9b3
Allows beheading in hard crit (#39491)
XDTM Aug 1, 2018
9e2358a
Automatic changelog generation for PR #39491 [ci skip]
tgstation-server Aug 1, 2018
0706ef8
Makes detect_room type agnostic again (#39443)
ninjanomnom Aug 1, 2018
80bf728
Fix minor pubby atmos issues (#39494)
granpawalton Aug 1, 2018
cc3d64c
Automatic changelog generation for PR #39494 [ci skip]
tgstation-server Aug 1, 2018
b49221b
Tweak the delta white ship a bit more (#39486)
WJohn Aug 1, 2018
3ed1893
Automatic changelog generation for PR #39486 [ci skip]
tgstation-server Aug 1, 2018
e62ef1f
Checks the Emperor Penguin description's privilege (#39483)
Anonmare Aug 1, 2018
67bfdfe
Rapid attacking simple animals (#39426)
AnturK Aug 1, 2018
44b078e
Fix COMSIG_PARENT_ATTACKBY for mobs (#39468)
Garen7 Aug 1, 2018
d6ba215
Automatic changelog generation for PR #39468 [ci skip]
tgstation-server Aug 1, 2018
d62e121
Add pipe dispenser to pirate ship (#39497)
granpawalton Aug 1, 2018
fafca4a
Automatic changelog generation for PR #39497 [ci skip]
tgstation-server Aug 1, 2018
98a3577
Fix the cig reagent bug, remove pointless and buggy RNG (#39334)
Supermichael777 Aug 1, 2018
e7338e1
Automatic changelog generation for PR #39334 [ci skip]
tgstation-server Aug 1, 2018
e248d34
Removes the shuttle timid var (#39445)
ninjanomnom Aug 2, 2018
befaa09
Removes a couple storage GetComponent calls
ninjanomnom Aug 1, 2018
01ef505
camera sprites (#39508)
Mickyan Aug 2, 2018
b258d6d
Automatic changelog generation for PR #39508 [ci skip]
tgstation-server Aug 2, 2018
a80a2ae
Deadchat can now use emoji (#39493)
JJRcop Aug 2, 2018
45ec7d3
Merge pull request #39481 from AutomaticFrenzy/patch/syntax
Cyberboss Aug 2, 2018
acf756f
Automatic changelog generation for PR #39481 [ci skip]
tgstation-server Aug 2, 2018
5b37938
Lavaland Syndie base tweaks (#39472)
81Denton Aug 3, 2018
ce0b6ac
Automatic changelog generation for PR #39472 [ci skip]
tgstation-server Aug 3, 2018
a278f1b
Teach simple animals how to dodge (#39383)
AnturK Aug 3, 2018
bed358e
Fixes borg dusting (#39537)
AnturK Aug 3, 2018
bae4bf3
Automatic changelog compile, [ci skip]
tgstation-server Aug 3, 2018
00e90f7
Adds in a new type of securitron (#39382)
Kmc2000 Aug 3, 2018
f59962c
Automatic changelog generation for PR #39382 [ci skip]
tgstation-server Aug 3, 2018
0e106c8
Adds a new RoundEnd Sound. (#39391)
ArcaneMusic Aug 3, 2018
6c70d32
Automatic changelog generation for PR #39391 [ci skip]
tgstation-server Aug 3, 2018
5cec0a0
Splits fakedeath and death coma, gives fakedeath to zombies and skele…
XDTM Aug 3, 2018
a7b713f
Automatic changelog generation for PR #39487 [ci skip]
tgstation-server Aug 3, 2018
2eab2ab
Adds scrubber pipenet to lavaland mining base, fixes two Meta tiles (…
81Denton Aug 3, 2018
22b5451
Automatic changelog generation for PR #39490 [ci skip]
tgstation-server Aug 3, 2018
b5caff1
Makes fiddling with air alarms go to atmos investigate log (#39501)
AnturK Aug 3, 2018
2fc303e
All adminsay now uses the adminobserver colour (#39511)
optimumtact Aug 3, 2018
315aaf7
Makes ooc block last whole cinematic and moves the object above hud. …
AnturK Aug 3, 2018
27876f0
[s] [HOTFIX] Being bumped into and not just bumping into people makes…
Aug 3, 2018
aeed2bc
Automatic changelog generation for PR #39514 [ci skip]
tgstation-server Aug 3, 2018
20c8540
Fixes pods not reaching centcom (#39526)
ninjanomnom Aug 3, 2018
b3538bc
Automatic changelog generation for PR #39526 [ci skip]
tgstation-server Aug 3, 2018
e9a55e0
Automatic changelog compile, [ci skip]
tgstation-server Aug 3, 2018
1abe257
Missing changelog for #39493
JJRcop Aug 3, 2018
15f0411
Merge pull request #39538 from JJRcop/9-18908
Cyberboss Aug 3, 2018
55b8788
Automatic changelog generation for PR #39538 [ci skip]
tgstation-server Aug 3, 2018
b9d0cc3
Automatic changelog compile, [ci skip]
tgstation-server Aug 3, 2018
22b13ac
Refactors syndicate simple animals. (#39531)
WJohn Aug 4, 2018
4ed13db
Automatic changelog generation for PR #39531 [ci skip]
tgstation-server Aug 4, 2018
5ab7990
Fix bad vars in maps spilling over onto unrelated types (#39530)
SpaceManiac Aug 4, 2018
402a495
Corrects box agent timer not getting properly reset
ShizCalev Aug 4, 2018
1b57f50
Fixes SDQL strings
JJRcop Aug 4, 2018
3f82ac8
Nanotrasen capitalization (#39547)
ShizCalev Aug 4, 2018
23c1724
Fix changeling antag hud icon (#39548)
ShizCalev Aug 4, 2018
8e94b5a
Fix ai status displays (#39534)
AnturK Aug 4, 2018
a922492
Make a few more things pronoun sensitive (#39546)
ShizCalev Aug 4, 2018
2b0038c
Users can now see their own prayers in the chat log (#39509)
JohnGinnane Aug 4, 2018
baf938f
Automatic changelog generation for PR #39509 [ci skip]
tgstation-server Aug 4, 2018
2aa69e4
Fix missing honkbot icon (#39545)
ShizCalev Aug 4, 2018
6afc453
Various mapfixes (#39541)
81Denton Aug 4, 2018
c009d0e
Automatic changelog generation for PR #39541 [ci skip]
tgstation-server Aug 4, 2018
83c427d
You can now show off your Attorney's Badge (#39533)
epochayur Aug 5, 2018
ac0f97b
Automatic changelog generation for PR #39533 [ci skip]
tgstation-server Aug 5, 2018
0fd11df
Add NTNet compatibility to windoors (#39540)
Y0SH1M4S73R Aug 5, 2018
748e81f
Automatic changelog generation for PR #39540 [ci skip]
tgstation-server Aug 5, 2018
9af8953
Implement Sci-Bounties, Bounty Setup Streamlining (#39507)
ExcessiveUseOfCobblestone Aug 5, 2018
341afe7
Automatic changelog generation for PR #39507 [ci skip]
tgstation-server Aug 5, 2018
c2f7b80
Being drunk improves mood (#39525)
Mickyan Aug 5, 2018
10f958a
Automatic changelog generation for PR #39525 [ci skip]
tgstation-server Aug 5, 2018
99072e4
Merge pull request #39505 from AnturK/sentientnonsense
optimumtact Aug 5, 2018
9cfe6aa
Merge pull request #39517 from ninjanomnom/remove-kevinz
optimumtact Aug 5, 2018
eecbc99
Moths can now eat clothes (#39350)
Mothblocks Aug 5, 2018
970f637
Automatic changelog generation for PR #39350 [ci skip]
tgstation-server Aug 5, 2018
189479d
Makes asay brighter orange (#39552)
optimumtact Aug 5, 2018
c5cf814
Increases agent box cooldown to 10 seconds (#39542)
Aug 5, 2018
1ad651c
Automatic changelog generation for PR #39542 [ci skip]
tgstation-server Aug 5, 2018
a27fea4
Merge pull request #39554 from ShizCalev/box-agent-timer
optimumtact Aug 5, 2018
efe3f1e
[READY] Fusion: Prepare to Die Edition (and more) (#39499)
mirrorcult Aug 5, 2018
fb94ec4
Automatic changelog generation for PR #39499 [ci skip]
tgstation-server Aug 5, 2018
8ed8e06
Add circuits text file in .dme (#39576)
Shdorsh Aug 5, 2018
68858f9
Automatic changelog generation for PR #39576 [ci skip]
tgstation-server Aug 5, 2018
c1870bd
Merge pull request #39555 from JJRcop/sdql_strings
Cyberboss Aug 6, 2018
dc37283
Automatic changelog generation for PR #39555 [ci skip]
tgstation-server Aug 6, 2018
12c5990
Fix AddComponent(target) not working with instanced components (#39484)
Garen7 Aug 6, 2018
cd7416f
Automatic changelog generation for PR #39484 [ci skip]
tgstation-server Aug 6, 2018
96bf040
Automatic changelog compile, [ci skip]
tgstation-server Aug 6, 2018
77e44d8
Redesign the pirate event ship (#39565)
WJohn Aug 7, 2018
054d6d1
Automatic changelog generation for PR #39565 [ci skip]
tgstation-server Aug 7, 2018
4e2792f
Remove unused tgui dependency (#39592)
SpaceManiac Aug 7, 2018
c5455b9
Automatic changelog compile, [ci skip]
tgstation-server Aug 7, 2018
ab915d5
Moves the Stealth Implant from Cybernetic Implants to Normal Implants…
Iamgoofball Aug 8, 2018
690b37b
Automatic changelog generation for PR #39564 [ci skip]
tgstation-server Aug 8, 2018
9bb8452
Fix beepsky cuffing its target even when EMP'd (#39596)
daklj Aug 8, 2018
1d1fdda
Automatic changelog generation for PR #39596 [ci skip]
tgstation-server Aug 8, 2018
3a32240
Augmentation uses replace_limb instead of manually doing the same (#3…
XDTM Aug 8, 2018
d66b8dc
Replace z_is_planet with a Z trait (#39581)
SpaceManiac Aug 8, 2018
723c8e5
Fix even more weird syntax (#39594)
SpaceManiac Aug 8, 2018
678760a
Automatic changelog compile, [ci skip]
tgstation-server Aug 8, 2018
48ece11
Felinid/catpeople are now their own human subspecies (#39513)
silicons Aug 8, 2018
fa5fc60
Automatic changelog generation for PR #39513 [ci skip]
tgstation-server Aug 8, 2018
05fb1c7
Adds five new cargo packs (#39569)
81Denton Aug 8, 2018
7a1323e
Automatic changelog generation for PR #39569 [ci skip]
tgstation-server Aug 8, 2018
b62562f
Improve VV performance further by avoiding redundant work (#39579)
SpaceManiac Aug 8, 2018
f1edf29
Open statbus links in external browser (#39575)
SpaceManiac Aug 8, 2018
315e40d
Prefer non-hidden pipes in gas meter targeting (#39591)
SpaceManiac Aug 8, 2018
c763660
Automatic changelog generation for PR #39591 [ci skip]
tgstation-server Aug 8, 2018
fe30e9a
Fix the power flow control console (#39580)
SpaceManiac Aug 8, 2018
30dd028
Automatic changelog generation for PR #39580 [ci skip]
tgstation-server Aug 8, 2018
7d71f4b
Adds mini-extinguishers to autolathe (#39599)
Mark9013100 Aug 8, 2018
a28a39a
Automatic changelog generation for PR #39599 [ci skip]
tgstation-server Aug 8, 2018
c8858b2
Removes an unneccessary subtype (#39604)
Anonmare Aug 8, 2018
ce4405e
Automatic changelog compile, [ci skip]
tgstation-server Aug 8, 2018
6ad9502
Automatic changelog compile, [ci skip]
tgstation-server Aug 9, 2018
d5beea1
Ports Binoculars from /vg/: 2 Electric boogaloo (#39544)
CitrusGender Aug 9, 2018
dd88c7b
Mapping changes to BoxStation's science (#39318)
nicbn Aug 9, 2018
d0913be
Automatic changelog generation for PR #39318 [ci skip]
tgstation-server Aug 9, 2018
52af568
Portable flashers will only count sucessful flashes towards burnout p…
AnturK Aug 9, 2018
1e566bd
Automatic changelog generation for PR #39602 [ci skip]
tgstation-server Aug 9, 2018
abb5e84
Adds mining and engineering cargo bounties (#39568)
81Denton Aug 9, 2018
c06a1a7
Automatic changelog generation for PR #39568 [ci skip]
tgstation-server Aug 9, 2018
54275ee
Fix bunch of runtimes involving transformation diseases, and also a w…
vuonojenmustaturska Aug 9, 2018
bd03223
Automatic changelog generation for PR #39600 [ci skip]
tgstation-server Aug 9, 2018
5f4b418
Movespeed Modification System (#39181)
silicons Aug 9, 2018
a139ca3
Fix connection errors not showing with SSdbcore.ErrorMsg() (#39613)
Cyberboss Aug 9, 2018
600586c
Fixes var set lists on maps (#39615)
ShizCalev Aug 9, 2018
ded0d28
Allows admins to make pneumatic cannons fire nonitems (#39611)
silicons Aug 9, 2018
0fccc6d
Distinguish grab attempt state in logging (#39607)
zaracka Aug 9, 2018
297ca0e
Automatic changelog compile, [ci skip]
tgstation-server Aug 10, 2018
b83424b
Refactor the map loader (#39567)
SpaceManiac Aug 10, 2018
17548ca
Automatic changelog generation for PR #39567 [ci skip]
tgstation-server Aug 10, 2018
7881c6f
Automatic changelog compile, [ci skip]
tgstation-server Aug 10, 2018
fbb5377
Simple zombie for WJ (#39563)
AnturK Aug 10, 2018
b031915
Add holidays, fix beer day date (#39572)
81Denton Aug 10, 2018
ec456d2
Automatic changelog generation for PR #39572 [ci skip]
tgstation-server Aug 10, 2018
12c7453
Fix Uncrossed being called on the wrong turf's contents (#39625)
YPOQ Aug 10, 2018
71fa30e
Automatic changelog generation for PR #39625 [ci skip]
tgstation-server Aug 10, 2018
eecd136
readd asay to admin log (#39636)
Jordie0608 Aug 10, 2018
0f8b50d
Automatic changelog generation for PR #39636 [ci skip]
tgstation-server Aug 10, 2018
61f8cee
Fixes cult pylons destroying plating and cult floors deconstructing i…
YPOQ Aug 10, 2018
c6cad60
Automatic changelog generation for PR #39624 [ci skip]
tgstation-server Aug 10, 2018
85ea122
Fixes AI photo taking and printing (#39623)
YPOQ Aug 10, 2018
3538793
Automatic changelog generation for PR #39623 [ci skip]
tgstation-server Aug 10, 2018
fd4d915
blunt trauma consistency (#39605)
zaracka Aug 10, 2018
a5df026
Automatic changelog generation for PR #39605 [ci skip]
tgstation-server Aug 10, 2018
0d7ef3e
Key instead of ckey for user facing logs and ui (#39009)
Jordie0608 Aug 10, 2018
230e47c
Configuration entry refactor! (#39608)
silicons Aug 10, 2018
aa83728
Merge remote-tracking branch 'TGstation/master'
francinum Aug 11, 2018
2258b72
fixes dirty var
francinum Aug 11, 2018
7035d84
AAAAAAAAAAAAAAA
francinum Aug 11, 2018
f249d71
Fear and loathing in Las Vegas
francinum Aug 11, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions code/modules/admin/verbs/debug.dm
Original file line number Diff line number Diff line change
@@ -959,6 +959,50 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
to_chat(usr, "<span class='name'>[template.name]</span>")
to_chat(usr, "<span class='italics'>[template.description]</span>")

/client/proc/place_ruin()
set category = "Debug"
set name = "Spawn Ruin"
set desc = "Attempt to randomly place a specific ruin."
if (!holder)
return

var/list/exists = list()
for(var/landmark in GLOB.ruin_landmarks)
var/obj/effect/landmark/ruin/L = landmark
exists[L.ruin_template] = landmark

var/list/names = list()
names += "---- Space Ruins ----"
for(var/name in SSmapping.space_ruins_templates)
names[name] = list(SSmapping.space_ruins_templates[name], ZTRAIT_SPACE_RUINS, /area/space)
names += "---- Lava Ruins ----"
for(var/name in SSmapping.lava_ruins_templates)
names[name] = list(SSmapping.lava_ruins_templates[name], ZTRAIT_LAVA_RUINS, /area/lavaland/surface/outdoors/unexplored)

var/ruinname = input("Select ruin", "Spawn Ruin") as null|anything in names
var/data = names[ruinname]
if (!data)
return
var/datum/map_template/ruin/template = data[1]
if (exists[template])
var/response = alert("There is already a [template] in existence.", "Spawn Ruin", "Jump", "Place Another", "Cancel")
if (response == "Jump")
usr.forceMove(get_turf(exists[template]))
return
else if (response == "Cancel")
return

var/len = GLOB.ruin_landmarks.len
seedRuins(SSmapping.levels_by_trait(data[2]), max(1, template.cost), data[3], list(ruinname = template))
if (GLOB.ruin_landmarks.len > len)
var/obj/effect/landmark/ruin/landmark = GLOB.ruin_landmarks[GLOB.ruin_landmarks.len]
log_admin("[key_name(src)] randomly spawned ruin [ruinname] at [COORD(landmark)].")
usr.forceMove(get_turf(landmark))
to_chat(src, "<span class='name'>[template.name]</span>")
to_chat(src, "<span class='italics'>[template.description]</span>")
else
to_chat(src, "<span class='warning'>Failed to place [template.name].</span>")

/client/proc/clear_dynamic_transit()
set category = "Debug"
set name = "Clear Dynamic Turf Reservations"
1 change: 1 addition & 0 deletions code/modules/admin/verbs/mapping.dm
Original file line number Diff line number Diff line change
@@ -48,6 +48,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
/client/proc/show_line_profiling,
/client/proc/create_mapping_job_icons,
/client/proc/debug_z_levels,
/client/proc/place_ruin,
))

/obj/effect/debugging/mapfix_marker