shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,656 Commits 5 Branches 0 Tags
fc04d94a293342355a2a00a26fcd186b2000e072
Commit Graph

127 Commits

Author SHA1 Message Date
nicbn
8aef4f3b57 Rename brown gas to nitryl (#32271) 2017-11-01 21:37:20 -05:00
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
LetterJay
141de52658 Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791 
[MIRROR] Assmos part 1, #2
 2017-10-27 02:47:56 -04:00
LetterJay
4fee09e236 Merge pull request #3613 from Citadel-Station-13/upstream-merge-32098 
[MIRROR] Fixes a runtime on organ replacement
 2017-10-27 02:16:47 -04:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
ACCount
1c1f39d1d3 Fixes a runtime on organ replacement 2017-10-25 23:38:31 -05:00
Leo
1f83d3cbb7 Merge pull request #32071 from ShizCalev/heart-spam-fix 
Fixes heartbeat message spam
 2017-10-25 18:55:24 -05:00
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
Poojawa
62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot
e827f02863 [MIRROR] Fixes various spelling and grammar errors. (#3436) 
* Fixes various spelling and grammar errors.

* Update crashedship.dm

* Update listeningstation.dm

* Update augments_chest.dm

* Update augments_chest.dm
 2017-10-21 07:10:23 -05:00
Jordan Brown
f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
kevinz000
cee28e27fe Fixes invalid arg runtime with drop_if_replaced (#31439) 
* Update augments_eyes.dm

* Update eyes.dm
 2017-10-09 19:05:18 -05:00
LetterJay
6cb68e06e3 Update autoimplanter.dm 2017-10-08 15:07:28 -05:00
LetterJay
86d9e5955a Update autoimplanter.dm 2017-10-08 14:51:27 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
oranges
c22f4a044d Merge pull request #31238 from AnturK/specialeyes 
Space vision fix V2.0 - GAME_PLANE change
 2017-10-04 15:14:07 -05:00
AnturK
fd5acc5573 Organ initialization cleanup 2017-10-03 14:18:39 -05:00
ShizCalev
9da41c3596 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110) 
* Stops revheads metagaming

* Added comment.
 2017-09-28 22:00:16 -05:00
LetterJay
d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00
ShizCalev
169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
pubby
34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
Robustin
e9534fb156 Fix: No more beating sounds from dead hearts (#30871) 
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Removes beating from nonbeating hearts

* single check
 2017-09-20 10:58:55 -05:00
CitadelStationBot
4bc6e9d522 [MIRROR] Cleaned up some decimal values. (#2797) 
* Cleaned up some decimal values.

* Update gas_mixture.dm

* Update color.dm

* Update medsci.dm
 2017-09-18 01:45:39 -05:00
LetterJay
c0a467c2fc Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415 
[MIRROR] Nightmare
 2017-09-12 23:31:38 -05:00
oranges
9341846304 Merge pull request #30624 from ShizCalev/autosurgeon-tk 
Fixes TK implanting yourself with an autosurgeon
 2017-09-12 17:13:03 -05:00
LetterJay
342ee9cfb3 Merge pull request #2717 from Citadel-Station-13/sssssssssssssssssssssssssssssss 
Sssssssssssssssssssssssssssssss
 2017-09-12 03:21:06 -05:00
LetterJay
6c9609a7ee Merge branch 'master' into upstream-merge-30580 2017-09-11 23:19:07 -05:00
LetterJay
cce196585b addsssssssssssssssssssssssss hisssssssssssssssssssssssssssing back sssssssssssssssssssssssso people will ssssssssssssssssssssssstop bitching 2017-09-11 23:15:47 -05:00
KorPhaeron
4d2fe460ed Nightmare 2017-09-11 16:23:47 -05:00
LetterJay
01a5e4bddf Merge pull request #2600 from Citadel-Station-13/Lisp 
disables the lisp that lizard tongues have
 2017-09-11 13:16:15 -05:00
Firecage
1e0297f9ef Adds cybernetic lungs(and an upgraded and actually useful variety) to the game. (#30382) 
* Adds cybernetic lungs

* Added better cold thresholds to the upgraded cybernetic lungs. Heat threshold remains the same though for balance reasons.

* Adds an EMP effect to cybernetic lungs.
 2017-09-10 14:31:47 -05:00
KorPhaeron
134c3f5f39 Losebreath 2017-09-10 12:37:29 -05:00
LetterJay
64b94e9393 disables the lisp that lizard tongues have 2017-09-04 11:07:47 -05:00
LetterJay
92e055be97 Quick sync (#2587) 
* sync since the mirror was down

* fucking byond

* can't forget these
 2017-09-04 04:38:49 -05:00
kevinz000
c00d7aa3f6 Update ears.dm (#2489) 2017-09-04 02:39:20 -05:00
CitadelStationBot
e7a6c2d09f [MIRROR] Fixes anti-drop exploit (#2589) 
* Fixes anti-drop exploit

* Update augments_internal.dm
 2017-09-03 14:59:30 -07:00
LetterJay
5d1c2c523b Fixes no drop implant 2017-09-02 05:31:15 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
kevinz000
61e6f2815b Update stomach.dm (#2453) 2017-08-21 20:27:21 -07:00
CitadelStationBot
4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -07:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
CitadelStationBot
fd59456a73 [MIRROR] Adds Surgical toolarms to R&D, makes them less robust (#2197) 
* Adds Surgical toolarms to R&D, makes them less robust

* Delete medical_designs.dm

* Delete augments_arms.dm

* Delete tools.dm
 2017-08-05 10:27:12 -07:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00