shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,116 Commits 5 Branches 0 Tags
231da023ec9c073f1644172794de8ef2dc43017e
Commit Graph

8176 Commits

Author SHA1 Message Date
deathride58
efa1f99f9d Merge pull request #5495 from Citadel-Station-13/upstream-merge-35548 
[MIRROR] Slime Radio Potion
 2018-02-16 01:12:07 +00:00
vuonojenmustaturska
002f0c41dc Merge pull request #35680 from MoreRobustThanYou/patch-60 
Fixes SCP-294 losing its top sometimes
 2018-02-15 16:24:28 -06:00
ShizCalev
98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
oranges
7fd53748f0 Merge pull request #35606 from coiax/hydroponic-foods-taste 
Apples now taste like apples
 2018-02-15 14:52:26 -06:00
Ashe Higgs
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
Cruix
5005fb20c6 Added chemical reaction unit tests 2018-02-15 14:34:41 -06:00
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
MMMiracles
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
AnturK
10a40524ab Cleans up remnant traitor cyborg code and AI hacking. 2018-02-15 10:40:04 -06:00
ThePainkiller
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
FrozenGuy5
efb5cd342c Spellchecks announcement's grammar (#35636) 
* no <br>

* i shall not take the risk
 2018-02-15 10:39:25 -06:00
Jordan Brown
f93365c00b Fix GLOB setup runtimes not affecting the counter (#35644) 2018-02-15 10:39:17 -06:00
Tad Hardesty
5b30b29a4b Support stations with multiple z-levels (#35339) 
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
 2018-02-15 10:39:08 -06:00
KorPhaeron
0ed0abbd4c Slime Radio Potion (#35548) 
* Slime Radio Potion

* Deletes inaccurate comment
 2018-02-15 10:38:59 -06:00
vuonojenmustaturska
e70194f329 Merge pull request #35561 from ShizCalev/rndconsole-runtime 
Fixes rnd console runtimes
 2018-02-15 10:38:49 -06:00
Chayse Ramsay
9c3c039dc1 Commenting out civilian job global init 2018-02-15 10:15:02 +00:00
Jordie
fe63a4527f Merge pull request #35660 from Iamgoofball/patch-397 
[s] Trit no longer makes radiation
 2018-02-14 19:14:14 -06:00
Poojawa
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
deathride58
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
CitadelStationBot
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
kevinz000
1309f0a22f Disables emagging Centcom Ferry (#35579) 2018-02-14 10:19:50 -06:00
CitadelStationBot
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
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
deathride58
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
deathride58
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
deathride58
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
Dax Dupont
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
deathride58
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
Jordan Brown
807a2ebaeb Merge pull request #35605 from MrStonedOne/patch-481 
Fixes ai transform being picky
 2018-02-13 21:00:05 -06:00
Jordan Brown
da5cc6a8cc Merge pull request #35618 from YPOQ/processdeaddiseasefix 
Fixes process_dead diseases not processing at all
 2018-02-13 20:58:48 -06:00
AnturK
38145c93c7 Greentext antag datum and OnRoundend hook. (#35584) 
* Greentext antag datum and OnRoundend hook.

* review stuff
 2018-02-13 19:43:54 -06:00
vuonojenmustaturska
9041b0b264 Disables clogged vents until it can be reworked 2018-02-13 18:46:43 -06:00
deathride58
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
Jack Edge
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
vuonojenmustaturska
6bdb3ad4c0 Merge pull request #35594 from praisenarsie/patch-30 
Fixes rat kebabs
 2018-02-13 17:15:31 -06:00
vuonojenmustaturska
6a094232bc Merge pull request #35642 from MrStonedOne/patch-482 
[s]Fixes blacklisted byond builds
 2018-02-13 16:48:48 -06:00
deathride58
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
Iamgoofball
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
oranges
e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
deathride58
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
LetterJay
311463c03d Merge pull request #5459 from Citadel-Station-13/upstream-merge-35574 
[MIRROR] Sanity check for sentience event
 2018-02-13 10:27:09 -06:00
LetterJay
42c197b1df Merge pull request #5458 from Citadel-Station-13/upstream-merge-35625 
[MIRROR] Removes the empty moth language file
 2018-02-13 10:26:57 -06:00
vuonojenmustaturska
3c9966041d Merge pull request #35571 from ShizCalev/spider_infestation-fix 
Fixes spider_infestation event
 2018-02-13 10:23:28 -06:00
vuonojenmustaturska
a103a44252 Merge pull request #35574 from ShizCalev/sentience-fix 
Sanity check for sentience event
 2018-02-13 10:00:47 -06:00
Leo
6d980b488d Merge pull request #35625 from praisenarsie/patch-31 
Removes the empty moth language file
 2018-02-13 08:55:12 -06:00
ShizCalev
833a700cbb Fixes invalid throwat args (#35565) 2018-02-13 07:14:47 -06:00
LetterJay
7cf942250c Merge pull request #5455 from Citadel-Station-13/upstream-merge-35572 
[MIRROR] Fixes skateboard runtime
 2018-02-13 06:28:05 -06:00
LetterJay
8a957d64bf Merge pull request #5454 from Citadel-Station-13/upstream-merge-35576 
[MIRROR] Fixes blood contracts being unusable if the popup is cancelled
 2018-02-13 06:27:55 -06:00
ShizCalev
c45c1c17df Fixes scooter runtime 2018-02-12 23:43:32 -06:00
YPO
e3e65a5237 Fixes blood contracts being unusable if the popup is cancelled 2018-02-12 23:42:19 -06:00