shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,166 Commits 5 Branches 0 Tags
e5aa6ea1cd223c08935cdcdab4e2d8a4e5127ffa
Commit Graph

9021 Commits

Author SHA1 Message Date
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
deathride58 04f852af24 Merge pull request #5473 from Citadel-Station-13/upstream-merge-35612 
[MIRROR] Prevents docking ports from being thrown away by chasms
 2018-02-14 03:09:52 +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 132b8cc816 Merge pull request #5472 from Citadel-Station-13/upstream-merge-35427 
[MIRROR] Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities
 2018-02-14 03:08:23 +00: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
Jordan Brown 70f90f8252 Merge pull request #35612 from vuonojenmustaturska/vuonojenmustaturska-patch-1 
Prevents docking ports from being thrown away by chasms
 2018-02-13 20:57:35 -06:00
ExcessiveUseOfCobblestone 745ca227c3 Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities (#35427) 
* Update portable_turret.dm

* Update portable_turret.dm

* Update portable_turret.dm

* f
 2018-02-13 20:47:14 -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
deathride58 eb72a2fe12 Merge pull request #5468 from Citadel-Station-13/upstream-merge-35647 
[MIRROR] Fix for invisible heartboxes
 2018-02-14 00:37:19 +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
TehZombehz 1346e88e6b Fix for invisible heartboxes 2018-02-13 18:08:38 -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 cdcf5f8982 Merge pull request #5461 from Citadel-Station-13/upstream-merge-35575 
[MIRROR] Fixes communications console runtime
 2018-02-13 17:19:00 +00: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
vuonojenmustaturska d44ccdb009 Merge pull request #35575 from ShizCalev/communications-console-runtime 
Fixes communications console runtime
 2018-02-13 10:29:47 -06: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
Cebutris 440e39ed68 limits the hallucinations a little 2018-02-12 22:15:53 -05: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
Cebutris d0fa073a5d adds in a hallucinogenic collar and a dirty sweater 2018-02-12 21:57:24 -05: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
oranges aa4b92faad Merge pull request #35598 from ShizCalev/announcement-exploit-fix 
[s] fixes announcement system exploit
 2018-02-12 19:33:28 -06: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
vuonojenmustaturska a60410b347 Merge pull request #35557 from ShizCalev/pda-virus-fix 
Fixes PDA virus runtime
 2018-02-12 16:32:07 -06: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
deathride58 f5eb7f7101 Update cell_charger.dm 2018-02-12 13:42:51 -05: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