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

14311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MMMiracles 5493339c7d Adds Tinfoil Hats (#35665) 
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
 2018-02-25 18:11:48 -06:00
CitadelStationBot bebbc1611d Automatic changelog generation for PR #5711 [ci skip] 2018-02-25 16:59:58 -06:00
LetterJay fb705d7849 Merge pull request #5711 from Citadel-Station-13/upstream-merge-35960 
[MIRROR] Oh, uhh, that isn't smoke! It's steam. Hamburgers have a 1% chance to spawn as steamed hams.
 2018-02-25 16:59:56 -06:00
LetterJay 5978733f93 Merge pull request #5709 from Citadel-Station-13/upstream-merge-35977 
[MIRROR] Fix bogus var access
 2018-02-25 16:59:48 -06:00
CitadelStationBot b75932f688 Automatic changelog generation for PR #5702 [ci skip] 2018-02-25 16:59:40 -06:00
LetterJay d2607c0654 Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639 
[MIRROR] Refactors anti-magic into a component
 2018-02-25 16:59:38 -06:00
LetterJay 793ddf91cc Merge pull request #5693 from Citadel-Station-13/kevinz000-patch-1 
Gives banana spiders mouse opacity fulltile, they're no longer able to pull objects, and they become dense when controlled by players.
 2018-02-25 16:58:52 -06:00
CitadelStationBot 2ccdd0e0e4 Oh, uhh, that isn't smoke! It's steam. Hamburgers have a 1% chance to spawn as steamed hams. 2018-02-25 16:38:39 -06:00
Xhuis 919d7e2013 Steamed hams. 2018-02-25 16:38:39 -06:00
deathride58 c7760707e6 Update game_mode.dm 2018-02-25 16:43:54 -05:00
CitadelStationBot b6053a3ace Automatic changelog generation for PR #5707 [ci skip] 2018-02-25 15:42:23 -06:00
deathride58 621090d54d Merge pull request #5707 from Citadel-Station-13/upstream-merge-35840 
[MIRROR] Removes liver unfailure and makes alcohol do the killing thing sometimes
 2018-02-25 21:42:21 +00:00
deathride58 e721dfdc7c Merge pull request #5706 from Citadel-Station-13/upstream-merge-35754 
[MIRROR] Fixes a runtime in "reference decoder" circuit
 2018-02-25 21:41:54 +00:00
CitadelStationBot 8c0d4177be Automatic changelog generation for PR #5705 [ci skip] 2018-02-25 15:41:40 -06:00
deathride58 44d8fd6085 Merge pull request #5705 from Citadel-Station-13/upstream-merge-35744 
[MIRROR] Refactors butchering to a component - item-based butchering effectiveness, speed, and chances
 2018-02-25 21:41:38 +00:00
CitadelStationBot 4f5c793496 Automatic changelog generation for PR #5704 [ci skip] 2018-02-25 15:40:43 -06:00
deathride58 b0ca7f2aaa Merge pull request #5704 from Citadel-Station-13/upstream-merge-35667 
[MIRROR] [s] Fixes tritium rad_pulse overload
 2018-02-25 21:40:41 +00:00
CitadelStationBot b8559eed3f Automatic changelog generation for PR #5703 [ci skip] 2018-02-25 15:40:27 -06:00
deathride58 478c99b743 Merge pull request #5703 from Citadel-Station-13/upstream-merge-35657 
[MIRROR] Circuit cloning balance: Timed cloning, reduced upgrade disk material cost
 2018-02-25 21:40:25 +00:00
deathride58 a8e458188a Update inflict_handler.dm 2018-02-25 16:39:35 -05:00
deathride58 bee0f1a366 Update emplosion.dm 2018-02-25 16:39:16 -05:00
deathride58 bad80f8f54 Merge pull request #5700 from Citadel-Station-13/upstream-merge-35944 
[MIRROR] Fixes first_death check
 2018-02-25 21:38:02 +00:00
deathride58 86f30eaa6f Merge pull request #5699 from Citadel-Station-13/upstream-merge-35945 
[MIRROR] Removes definition redundancy
 2018-02-25 21:37:47 +00:00
CitadelStationBot 078833d187 Automatic changelog generation for PR #5698 [ci skip] 2018-02-25 15:34:47 -06:00
deathride58 41fa7b67c7 Merge pull request #5698 from Citadel-Station-13/upstream-merge-35938 
[MIRROR] Adds limitations to brain traumas
 2018-02-25 21:34:45 +00:00
deathride58 92233ab56e Merge pull request #5695 from Citadel-Station-13/upstream-merge-35936 
[MIRROR] Fixes gold slime extract reactions runtime
 2018-02-25 21:34:24 +00:00
Tad Hardesty 3790df44e5 Fix bogus var access 2018-02-25 15:24:46 -06:00
CitadelStationBot e119f95b78 Removes liver unfailure and makes alcohol do the killing thing sometimes 2018-02-25 14:52:53 -06:00
BordListian a75ac3bc13 Removes liver unfailure and makes alcohol do the killing thing sometimes (#35840) 
* - Removes liver unfailure

* - MY LIVER FAILED INSTANTLY

* - Increases liver damage tenfold because whats the point of this pr if you need to drink 100 liters of the toughest booze in the game before you get liver damage

* - Fixes cyber livers not being twice as durable as ordinary livers
- Ok compromise alcohol does twice as much liver damage
- Fixes livers regenerating after they failed

* - I'll be happy if bacchus blessing destroys my liver and absinthe doesn't

* - I think this is the final number I'll punch in. I downed 14 shot glasses of vodka
 2018-02-25 14:52:53 -06:00
CitadelStationBot 00aafb33e6 Fixes a runtime in "reference decoder" circuit 2018-02-25 14:51:42 -06:00
ACCount 7c5e9f968f Fixes a runtime in "reference decoder" circuit (#35754) 
* Adds "safe" option to hextostr and hex2num

* Fixes a runtime in ICs
 2018-02-25 14:51:41 -06:00
CitadelStationBot ba7b5657a5 Refactors butchering to a component - item-based butchering effectiveness, speed, and chances 2018-02-25 14:50:29 -06:00
Ashe Higgs a7d5e4cdcf Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744) 
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
 2018-02-25 14:50:29 -06:00
CitadelStationBot 9b16a199e6 [s] Fixes tritium rad_pulse overload 2018-02-25 14:49:18 -06:00
Buggy123 924463b7a5 [s] Fixes tritium rad_pulse overload (#35667) 
* Crashing the server is bad, mkay?

* BYOND PLEASE THIS IS KINDA IMPORTANT
 2018-02-25 14:49:18 -06:00
CitadelStationBot ebc4889231 Circuit cloning balance: Timed cloning, reduced upgrade disk material cost 2018-02-25 14:47:06 -06:00
Ashe Higgs 063fc1a7af Circuit cloning balance: Timed cloning, reduced upgrade disk material cost (#35657) 
* Printing compromise

* Adds fast cloning to the upgraded printer

* sorry this took so long
 2018-02-25 14:47:06 -06:00
XDTM 493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00
CitadelStationBot 0f0907d10d Fixes first_death check 2018-02-25 14:03:45 -06:00
Jordie 51a70bcd4f Fixes first_death check (#35944) 
* Update blackbox.dm

* Update blackbox.dm
 2018-02-25 14:03:45 -06:00
CitadelStationBot efb3d45bf6 Removes definition redundancy 2018-02-25 13:22:54 -06:00
Jordan Brown 1642f549ad Removes definition redundancy 2018-02-25 13:22:54 -06:00
CitadelStationBot 378d492c47 Adds limitations to brain traumas 2018-02-25 11:01:15 -06:00
XDTM bd6e8f0bbb Adds limitations to brain traumas (#35938) 
* Adds limitations to brain damage

* no need for these anymore

* a bit harder to gain traumas if you have some already

* (
 2018-02-25 11:01:15 -06:00
CitadelStationBot 1964aa0d6f Fixes gold slime extract reactions runtime 2018-02-24 22:01:04 -06:00
YPOQ 4257c9ff5a Fixes gold slime extract reactions runtime (#35936) 2018-02-24 22:01:04 -06:00
kevinz000 5971347949 Nerfhammer 2.0 2018-02-24 14:01:02 -08:00
kevinz000 b631a8dee1 nerfs griefing shits 2018-02-24 09:01:29 -08:00
CitadelStationBot 0589c06507 Automatic changelog generation for PR #5634 [ci skip] 2018-02-24 09:35:50 -06:00
CitadelStationBot 58413c4b54 [MIRROR] Renames various reagent IDs to be more descriptive (#5634) 
* Renames various reagent IDs to be more descriptive (#35824)

* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION

* Renames various reagent IDs to be more descriptive

* fixes compile issues with Travis
 2018-02-24 09:35:48 -06:00