shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,725 Commits 5 Branches 0 Tags
88ca65182d4ac09a8994395fc8f3a89fa4bbd03c
Commit Graph

5058 Commits

Author SHA1 Message Date
Jordie fe63a4527f Merge pull request #35660 from Iamgoofball/patch-397 
[s] Trit no longer makes radiation
 2018-02-14 19:14:14 -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
Buggy123 0c9bb1a249 Tritium now produces water vapor when combusting. (#35354) 
* HYDROGEN+OXYGEN=WATER

* Burning Tritium now produces a lot of radiation.

* Fixes check and line positions

* No longer spews absurd quantities of radiation.
 2018-02-12 21:11:22 -06:00
deathride58 0a384243f6 work! compile! actually function! 2018-02-12 21:22:09 -05:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
deathride58 06b7f239c4 Merge pull request #5447 from Citadel-Station-13/upstream-merge-35433 
[MIRROR] Cult Update? Cult Update!
 2018-02-12 23:29:06 +00:00
Jordan Brown 59f7343c5e Merge pull request #35603 from MrStonedOne/patch-480 
blacklists 512.1408 for basically being a wallhack (again)
 2018-02-12 16:23:44 -06:00
Robustin 1825c944b6 Cult Update? Cult Update! (#35433) 
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
 2018-02-12 15:18:21 -06:00
Dax Dupont a0feb17597 Cell chargers are now buildable and (upgradable!) machines. 2018-02-12 11:15:52 -06:00
LetterJay 6f117401de Merge pull request #5438 from Citadel-Station-13/upstream-merge-35524 
[MIRROR] Fatshaming the AI, moving him two tiles upward when mass_recall() happens
 2018-02-12 10:04:56 -06:00
LetterJay 2171016baa Merge pull request #5436 from Citadel-Station-13/upstream-merge-35549 
[MIRROR] Removes old golem items
 2018-02-12 10:04:31 -06:00
LetterJay ef8ce89fe2 Merge pull request #5435 from Citadel-Station-13/upstream-merge-35558 
[MIRROR] fulton pack not allowed on supply shuttle
 2018-02-12 10:04:12 -06:00
LetterJay 5a9b7a5173 Merge pull request #5434 from Citadel-Station-13/upstream-merge-35541 
[MIRROR] Fixes lye/plastic/charcoal conflicts
 2018-02-12 10:03:16 -06:00
LetterJay 15572d1d5f Merge pull request #5430 from Citadel-Station-13/upstream-merge-35514 
[MIRROR] Fixes wrong ID for syndicate ghost roles
 2018-02-12 10:01:42 -06:00
Dax Dupont c40925f529 Fatshaming the AI, moving him two tiles upward when mass_recall() happens (#35524) 2018-02-12 09:20:52 -06:00
vuonojenmustaturska 3d5e49f06d Merge pull request #35549 from KorPhaeron/golem 
Removes old golem items
 2018-02-12 09:09:14 -06:00
vuonojenmustaturska 0d40303254 Merge pull request #35558 from praisenarsie/patch-28 
fulton pack not allowed on supply shuttle
 2018-02-12 09:07:02 -06:00
vuonojenmustaturska 379ff0546a Merge pull request #35541 from 81Denton/chem-conflicts 
Fixes lye/plastic/charcoal conflicts
 2018-02-12 09:02:42 -06:00
deathride58 17ed07d3b2 Merge pull request #5427 from Citadel-Station-13/upstream-merge-35417 
[MIRROR] The chef is also a cook
 2018-02-11 23:35:29 +00:00