c1b3253b8d
Merge pull request #5485 from Poojawa/cryopods
...
Cryopods from Oracle Station
2018-02-16 05:56:34 +00:00
14d387fa04
Merge pull request #5513 from Citadel-Station-13/upstream-merge-35542
...
[MIRROR] Cleans up some duplicate canusetopic warnings
2018-02-15 22:17:54 -06:00
bf5c2ca887
Merge pull request #35693 from tgstation/Cyberboss-patch-2
...
Fix world/Error() trying to read config before it loads
2018-02-15 21:59:41 -06:00
f664c21aee
Merge pull request #5502 from Citadel-Station-13/upstream-merge-35586
...
[MIRROR] Cleans up remnant traitor cyborg code and AI hacking.
2018-02-16 03:04:35 +00:00
5dc3549801
Merge pull request #35542 from ShizCalev/free-spam-removal
...
Cleans up some duplicate canusetopic warnings
2018-02-15 20:35:03 -06:00
18f4d78449
Merge pull request #5512 from Citadel-Station-13/upstream-merge-35680
...
[MIRROR] Fixes SCP-294 losing its top sometimes
2018-02-16 01:32:41 +00:00
05ab5f7c0c
Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552
...
[MIRROR] [s]Fixes writing bugs/exploits
2018-02-16 01:32:23 +00:00
64dc40d293
Merge pull request #5509 from Citadel-Station-13/upstream-merge-35606
...
[MIRROR] Apples now taste like apples
2018-02-16 01:31:58 +00:00
4c2db869ef
Merge pull request #5508 from Citadel-Station-13/upstream-merge-35131
...
[MIRROR] Adds sounds and some small QoL improvements to the circuit imprinter, and allows them to recycle empty assemblies
2018-02-16 01:31:24 +00:00
d7c06fec6f
Merge pull request #5505 from Citadel-Station-13/upstream-merge-35342
...
[MIRROR] Adds Cryostatis Shotgun Darts
2018-02-16 01:29:14 +00:00
e873fce53f
Update laws.dm
2018-02-15 20:28:05 -05:00
05a0ce13a1
Merge pull request #5501 from Citadel-Station-13/upstream-merge-35611
...
[MIRROR] Spellcheck: Fixed a typo on an eldritch god's pronunciation
2018-02-16 01:27:09 +00:00
64ec78b5de
Merge pull request #5498 from Citadel-Station-13/upstream-merge-35636
...
[MIRROR] Spellchecks announcement's grammar
2018-02-16 01:26:09 +00:00
cd28894a2f
Merge pull request #5497 from Citadel-Station-13/upstream-merge-35644
...
[MIRROR] Fix GLOB setup runtimes not affecting the counter
2018-02-16 01:24:33 +00:00
efa1f99f9d
Merge pull request #5495 from Citadel-Station-13/upstream-merge-35548
...
[MIRROR] Slime Radio Potion
2018-02-16 01:12:07 +00:00
002f0c41dc
Merge pull request #35680 from MoreRobustThanYou/patch-60
...
Fixes SCP-294 losing its top sometimes
2018-02-15 16:24:28 -06:00
98bbfb8709
[s]Fixes writing bugs/exploits
2018-02-15 16:10:03 -06:00
7fd53748f0
Merge pull request #35606 from coiax/hydroponic-foods-taste
...
Apples now taste like apples
2018-02-15 14:52:26 -06:00
dc100371f3
Adds sounds and some small QoL improvements to the circuit imprinter, and allows them to recycle empty assemblies ( #35131 )
...
🆑 Xhuis
tweak: Removing and printing integrated circuits will now attempt to place them into a free hand.
tweak: You can now hit an integrated circuit printer with an unsecured electronic assembly to recycle all of the parts in the assembly en masse.
tweak: You can now recycle empty electronic assemblies in an integrated circuit printer!
soundadd: Integrated circuit printers now have sounds for printing circuits and assemblies.
/🆑
Some low-hanging fruit for circuits. I was trying them earlier, and these were the main things that I was surprised didn't exist, so I added them. I'm not sure about the assembly manipulation yet (may have been intentional?) but it feels a lot smoother to use, especially since misprints can be emptied out and then recycled instead of awkwardly removing each component and then disposing of the case.
2018-02-15 14:46:06 -06:00
bd9ad82bbf
Adds Cryostatis Shotgun Darts ( #35342 )
...
* adds cryostatis shotgun darts, because shooting tiny water+potassium bombs into people is funny
* lowers amount from 15 to 10
* Update ammo_casings.dm
2018-02-15 14:25:05 -06:00
10a40524ab
Cleans up remnant traitor cyborg code and AI hacking.
2018-02-15 10:40:04 -06:00
87708abd4c
Fixed a typo on an eldritch god's pronunciation ( #35611 )
...
Changed the text to get the Necronomicon. It's "Cthulhu" not "Cthulu", get it right!
2018-02-15 10:39:55 -06:00
efb5cd342c
Spellchecks announcement's grammar ( #35636 )
...
* no <br>
* i shall not take the risk
2018-02-15 10:39:25 -06:00
f93365c00b
Fix GLOB setup runtimes not affecting the counter ( #35644 )
2018-02-15 10:39:17 -06:00
0ed0abbd4c
Slime Radio Potion ( #35548 )
...
* Slime Radio Potion
* Deletes inaccurate comment
2018-02-15 10:38:59 -06:00
e70194f329
Merge pull request #35561 from ShizCalev/rndconsole-runtime
...
Fixes rnd console runtimes
2018-02-15 10:38:49 -06:00
fe63a4527f
Merge pull request #35660 from Iamgoofball/patch-397
...
[s] Trit no longer makes radiation
2018-02-14 19:14:14 -06:00
01bc7310b6
Cryopods from Oracle Station
...
It's really nice to have a tg based station that's porting good shit.
2018-02-14 14:06:33 -06:00
a13d41a675
Merge pull request #5483 from Citadel-Station-13/upstream-merge-35579
...
[MIRROR] Disables emagging Centcom Ferry
2018-02-14 17:09:36 +00:00
283a0418a3
[MIRROR] Makes the kinetic crusher's damage on examine a little more accurate ( #5481 )
...
* Merge pull request #35617 from ChangelingRain/crusherdescfix
Makes the kinetic crusher's damage on examine a little more accurate
* Makes the kinetic crusher's damage on examine a little more accurate
2018-02-14 10:55:47 -06:00
1309f0a22f
Disables emagging Centcom Ferry ( #35579 )
2018-02-14 10:19:50 -06:00
9b4770f855
[MIRROR] Mining tools now use tool system ( #5462 )
...
* Mining tools now use tool system
* Update hydroponics.dm
2018-02-14 05:36:15 -06:00
4ac2101d1a
Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
...
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
5bf11ca6d5
Merge pull request #5477 from Citadel-Station-13/upstream-merge-35506
...
[MIRROR] Assblasts some power creep in circuit labs
2018-02-14 04:10:32 +00:00
aa3ee6b6e2
Merge pull request #5475 from Citadel-Station-13/upstream-merge-35605
...
[MIRROR] Fixes ai transform being picky
2018-02-14 03:34:13 +00:00
d8b3726437
Merge pull request #5474 from Citadel-Station-13/upstream-merge-35618
...
[MIRROR] Fixes process_dead diseases not processing at all
2018-02-14 03:22:34 +00:00
98c9e0948f
Assblasts some power creep in circuit labs ( #35506 )
...
* Circuit printers no longer start upgraded.
* Replaces roundstart upgraded printer with regular printer
* Replaces roundstart upgraded printer with regular printer w\ key remap
2018-02-13 21:09:35 -06:00
6be0f70bf8
Merge pull request #5471 from Citadel-Station-13/upstream-merge-35584
...
[MIRROR] Greentext antag datum and OnRoundend hook.
2018-02-14 03:02:13 +00:00
807a2ebaeb
Merge pull request #35605 from MrStonedOne/patch-481
...
Fixes ai transform being picky
2018-02-13 21:00:05 -06:00
da5cc6a8cc
Merge pull request #35618 from YPOQ/processdeaddiseasefix
...
Fixes process_dead diseases not processing at all
2018-02-13 20:58:48 -06:00
38145c93c7
Greentext antag datum and OnRoundend hook. ( #35584 )
...
* Greentext antag datum and OnRoundend hook.
* review stuff
2018-02-13 19:43:54 -06:00
9041b0b264
Disables clogged vents until it can be reworked
2018-02-13 18:46:43 -06:00
668e0ed088
Merge pull request #5469 from Citadel-Station-13/upstream-merge-35607
...
[MIRROR] Transference potions rename the mob to just your name
2018-02-14 00:37:49 +00:00
dffee58459
Transference potions rename the mob to just your name
...
So instead of "Braxton Cherry as parrot", it'll just be "Braxton Cherry"
now. Polymorphing keeps your name, this has always bugged me as ugly and
unneeded.
2018-02-13 18:09:51 -06:00
6bdb3ad4c0
Merge pull request #35594 from praisenarsie/patch-30
...
Fixes rat kebabs
2018-02-13 17:15:31 -06:00
6a094232bc
Merge pull request #35642 from MrStonedOne/patch-482
...
[s]Fixes blacklisted byond builds
2018-02-13 16:48:48 -06:00
637720a3d9
Merge pull request #5465 from Citadel-Station-13/upstream-merge-35597
...
[MIRROR] The Cook now only works under siege.
2018-02-13 21:24:18 +00:00
5793fe893f
The Cook now only works under siege. ( #35597 )
...
The chef's CQC skill now only works in the kitchen area
2018-02-13 14:18:49 -06:00
e6ace7bc56
Adds heart-shaped boxes of chocolate to the valentines event
2018-02-13 14:12:32 -06:00
fd707fa9d0
Merge pull request #5460 from Citadel-Station-13/upstream-merge-35571
...
[MIRROR] Fixes spider_infestation event
2018-02-13 17:18:45 +00:00
deathride58