shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,555 Commits 5 Branches 0 Tags
39ecfd64dbdb1db91a375027b302a1ae1073f5d2
Commit Graph
7078 Commits
Author SHA1 Message Date
MoreRobustThanYouandCitadelStationBot 39ecfd64db Fix smoke machine runtime (#33697) 
* Fix smoke machine runtime

* Woops.
 2017-12-21 00:41:09 -06:00
deathride58andGitHub 4d08f9b0bc Merge pull request #4445 from Citadel-Station-13/upstream-merge-33635 
[MIRROR] Fixes captain's PDA showing the toggle remote door menu option
 2017-12-21 03:47:50 +00:00
deathride58andGitHub b4321a1dbe Merge pull request #4435 from Citadel-Station-13/upstream-merge-33636 
[MIRROR] restores reaction max_reqs checking code
 2017-12-21 03:44:57 +00:00
deathride58andGitHub 59947b4b3b Merge pull request #4424 from Citadel-Station-13/upstream-merge-33632 
[MIRROR] properly disables fusion
 2017-12-21 03:43:30 +00:00
deathride58andGitHub b2187123fb Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405 
[MIRROR] [Ready]Brain Trauma additions
 2017-12-21 03:42:38 +00:00
deathride58andGitHub cf80b8a573 Merge pull request #4453 from Citadel-Station-13/upstream-merge-33651 
[MIRROR] Changelings learn languages from people they absorb
 2017-12-21 03:30:22 +00:00
deathride58andGitHub 0be7ea0755 Merge pull request #4451 from Citadel-Station-13/upstream-merge-33599 
[MIRROR] Callback security and usr
 2017-12-21 03:29:13 +00:00
deathride58andGitHub 15233cbda3 Merge pull request #4460 from Citadel-Station-13/upstream-merge-33543 
[MIRROR] Adds NAMEOF, VARSET_CALLBACK, and VARSET_LIST_CALLBACK
 2017-12-21 03:28:46 +00:00
deathride58andGitHub 17dda62a93 Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622 
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-21 03:28:14 +00:00
deathride58andGitHub 58f5069180 Merge pull request #4463 from Citadel-Station-13/upstream-merge-33664 
[MIRROR] Halve gun empty sound level
 2017-12-21 03:27:50 +00:00
deathride58andGitHub 811cd917aa Merge pull request #4457 from Citadel-Station-13/upstream-merge-33683 
[MIRROR] Fixes get admin command
 2017-12-21 03:27:32 +00:00
deathride58andGitHub a30bcfa77f Merge pull request #4465 from Citadel-Station-13/upstream-merge-33669 
[MIRROR] Makes tails stop wagging when unconscious or stunned
 2017-12-21 03:26:00 +00:00
deathride58andGitHub 2de3b12364 Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594 
[MIRROR] Adds knock off component
 2017-12-21 03:25:41 +00:00
jughuandCitadelStationBot 2c4e5bae9e Fixes grammer issue (#33679) 2017-12-20 12:02:25 -06:00
ShizCalevandCitadelStationBot b83dd93309 lizard stuff (#33669) 2017-12-20 05:55:45 -06:00
Jordan BrownandCitadelStationBot 25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
Jordan BrownandCitadelStationBot b305f1bb26 Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears 
Halve gun empty sound level
 2017-12-20 00:14:28 -06:00
orangesandCitadelStationBot d960c45e77 Merge pull request #33622 from duncathan/assert_gas 
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-20 00:14:13 -06:00
Jordan BrownandCitadelStationBot e6e197c88a Adds NAMEOF, VARSET_CALLBACK, and VARSET_LIST_CALLBACK (#33543) 
* Adds NAMEOF and VARSET_CALLBACK

* Fix VARSET_CALLBACK

* Change names, add VARSET_LIST_CALLBACK

* Fix var names

* Additional macro safety. Update commen

* ImprovedName

* Fixing
 2017-12-20 00:14:03 -06:00
LetterJayandGitHub d6a5ee596b Update mind.dm 2017-12-19 23:55:36 -06:00
LetterJayandGitHub 5bd61908a3 Update game_mode.dm 2017-12-19 23:53:36 -06:00
LetterJayandGitHub 4d5c32ae56 Update game_mode.dm 2017-12-19 22:11:04 -06:00
LetterJay 7dec65ff85 fuck 2017-12-19 20:20:09 -06:00
LetterJayandGitHub 36ad355f9d Update mind.dm 2017-12-19 20:08:49 -06:00
LetterJayandGitHub a8e36670e2 Update mind.dm 2017-12-19 20:02:03 -06:00
LetterJayandGitHub efc41a15d3 Update mob_helpers.dm 2017-12-19 19:36:03 -06:00
LetterJayandGitHub 9ab75d37b7 Update operative.dm 2017-12-19 19:35:41 -06:00
LetterJayandGitHub 2148eb021b Update randomverbs.dm 2017-12-19 19:34:44 -06:00
LetterJayandGitHub da2bf6293f Update one_click_antag.dm 2017-12-19 19:34:02 -06:00
LetterJayandGitHub 80412ae3b9 Update player_panel.dm 2017-12-19 19:32:18 -06:00
LetterJayandGitHub 74bba8aea7 Update cards_ids.dm 2017-12-19 19:31:44 -06:00
LetterJayandGitHub 2b434438e0 Update telecrystalconsoles.dm 2017-12-19 19:31:17 -06:00
LetterJayandGitHub 9d90a2bf5b Update pinpointer.dm 2017-12-19 19:30:54 -06:00
LetterJayandGitHub c545ef06cd Update nuclearbomb.dm 2017-12-19 19:30:23 -06:00
LetterJayandGitHub 951a540882 Update nuclear.dm 2017-12-19 19:29:27 -06:00
LetterJayandGitHub 992984388b Update game_mode.dm 2017-12-19 19:29:04 -06:00
LetterJayandGitHub 5983d7b13d Update antag_spawner.dm 2017-12-19 19:27:36 -06:00
LetterJayandGitHub 614e93b975 Update mind.dm 2017-12-19 19:26:28 -06:00
LetterJayandGitHub e6cab75e71 NukeDatum 2017-12-19 19:22:03 -06:00
LetterJayandGitHub bcbb4102bf Update disease_outbreak.dm 2017-12-19 18:50:43 -06:00
LetterJayandGitHub 63b1b1df88 Update disease_outbreak.dm 2017-12-19 18:40:20 -06:00
LetterJayandGitHub f3e031fe2f Update telecrystalconsoles.dm 2017-12-19 18:02:16 -06:00
LetterJayandGitHub 56737f32de Update disease_outbreak.dm 2017-12-19 17:59:55 -06:00
LetterJayandGitHub 6c39e94bba Update observer.dm 2017-12-19 17:56:52 -06:00
LetterJayandGitHub 30796ad342 Update cit_arousal.dm 2017-12-19 17:56:06 -06:00
LetterJayandGitHub 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJayandGitHub a98178251d Merge pull request #4444 from Citadel-Station-13/upstream-merge-33531 
[MIRROR] [READY]Cyborg jousting with spears!
 2017-12-19 17:31:26 -06:00
LetterJayandGitHub 516db4851f Update disease_outbreak.dm 2017-12-19 16:53:21 -06:00
LetterJayandGitHub 16f1a07b92 diseases 2017-12-19 16:41:09 -06:00
LetterJayandGitHub 063854e2d0 Update aphasia.dm 2017-12-19 15:28:37 -06:00