shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,395 Commits 5 Branches 0 Tags
4143564a67cfecf4c969481b7819ab54d82c0844
Commit Graph

26437 Commits

Author SHA1 Message Date
silicons
4143564a67 Merge pull request #13996 from MrJWhit/morph-becoming-an-ai-fix 
Port of: Prevents the morph from become an AI eye
 2021-01-08 01:12:30 -07:00
MrJWhit
cc2bcfedf1 Update garbage.dm 2021-01-07 22:50:03 -05:00
DeltaFire
d153d82441 Merge pull request #13931 from shellspeed1/porting-turret 
Ports disposable sentry gun for station engineers as a traitor item from TG
 2021-01-08 02:59:48 +01:00
MrJWhit
784fca8bd4 Hehe fixies 2021-01-07 20:59:37 -05:00
Lin
b7cf425dff Merge pull request #13988 from DeltaFire15/who-reads-these-anyways 
[s] we love private orders
 2021-01-08 01:08:31 +00:00
shellspeed1
a25af6ea0c Update uplink_roles.dm 2021-01-07 16:53:09 -08:00
silicons
f06a7c1ec3 Merge pull request #13980 from MrJWhit/first-things-first 
Makes gas sensors fireproof
 2021-01-07 17:22:41 -07:00
silicons
21101e62dd Merge pull request #13983 from shellspeed1/xenohybrid-stuff 
Adds some flavor stuff for the xenohybrid species tongue as well as wings. No longer includes language.
 2021-01-07 17:22:28 -07:00
DeltaFire
d100fe1d58 Merge pull request #13981 from MrJWhit/caution-sign 
Porting the ability to wear the caution sign (plus a random metastation fix)
 2021-01-07 20:17:03 +01:00
DeltaFire
3d09edfc4b Merge pull request #13978 from Citadel-Station-13/silicons-patch-3 
removes c4 mob gibbing
 2021-01-07 06:22:06 +01:00
shellspeed1
926b4ca609 Merge branch 'porting-turret' of https://github.com/shellspeed1/Citadel-Station-13 into porting-turret 2021-01-06 18:48:47 -08:00
shellspeed1
21e81faff5 Update traitordevices.dm 2021-01-06 18:48:02 -08:00
shellspeed1
b5e8d3308c Update traitordevices.dm 2021-01-06 18:40:49 -08:00
silicons
90826aeb28 Update robot_parts.dm 2021-01-06 19:39:28 -07:00
shellspeed1
67364f4254 Update traitordevices.dm 2021-01-06 18:26:07 -08:00
DeltaFire
e37790a997 fix 2021-01-07 00:23:18 +01:00
shellspeed1
0144a06964 Removes language to be done later 2021-01-06 11:59:37 -08:00
MrJWhit
ba98a0aacd Update miscellaneous.dm 2021-01-06 14:42:00 -05:00
DeltaFire
3f736aaa36 Merge pull request #13834 from zeroisthebiggay/pogbox 
ports the traitor assistant POGBOX that scales damage with tc from /TG/
 2021-01-06 19:29:17 +01:00
DeltaFire
8b876aa6e3 Merge pull request #13957 from Citadel-Station-13/silicons-patch-1 
[s] logging patch 36735734
 2021-01-06 19:23:09 +01:00
shellspeed1
98f8af853c Minor xenohybrid changeschanges 
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
 2021-01-06 01:58:58 -08:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
MrJWhit
1cf951c4d4 Update atmos_control.dm 2021-01-06 02:38:37 -05:00
silicons
6c9c3cc2d8 Merge pull request #13968 from Arturlang/pray_sounds 
Ding for prayers
 2021-01-05 23:39:37 -07:00
silicons
ab59a0d035 Update plastic.dm 2021-01-05 23:38:33 -07:00
Lin
f724554059 Merge pull request #13964 from Citadel-Station-13/silicons-patch-2 
fixes parrying working while otherwise paralyzed
 2021-01-05 16:48:20 +00:00
silicons
cfc560ed3d Merge pull request #13856 from Putnam3145/harness-tweak-2 
Actually made gear harness properly adjustable
 2021-01-05 02:52:41 -07:00
Artur
9e16df56aa Ding for prayers 2021-01-04 23:23:55 +02:00
silicons
c937021b68 Update living_active_parry.dm 2021-01-04 03:17:51 -07:00
silicons
d6d753e9f7 Merge pull request #13959 from necromanceranne/bokken_fixes 
Bokken Fixes: You can make them now. Nyoops.
 2021-01-03 21:37:33 -07:00
necromanceranne
0fda694a52 A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused. 2021-01-04 15:30:28 +11:00
silicons
a0d58cd18d Merge pull request #13954 from EmeraldSundisk/coglocks 
Cog and firelocks.
 2021-01-03 20:19:46 -07:00
zeroisthebiggay
b20607cb1a Update toolbox.dm 2021-01-03 20:18:55 -05:00
silicons
4c6cc24343 Merge pull request #13948 from necromanceranne/sheath_stuff 
Bokken and Bokken Accessories: Bonkvengeance
 2021-01-03 18:18:29 -07:00
silicons
3897463f0b Merge pull request #13955 from Chiirno/NightmareLightsout 
Nightmare Lights Damage Buff
 2021-01-03 18:15:00 -07:00
silicons
7357ae3bc0 Merge pull request #13951 from BlueWildrose/CompensatingForSomething 
Max groin cannon size increased before being punished for erecting a massive mayo-blaster to -max roundstart config- inches instead of 20
 2021-01-03 18:13:50 -07:00
silicons
8dfbf3eb87 Merge pull request #13947 from Chiirno/ChemmasterOutputFix 
Chemmaster output buff
 2021-01-03 18:12:57 -07:00
silicons
092e7569c2 Merge pull request #13932 from shellspeed1/Ports-xeno-QOL-stuff 
Ports xenomorph plasma usage in power description from bee
 2021-01-03 18:11:18 -07:00
silicons
ccbfd4015e Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon 
Ports bluespace navigation gigabeacon from TG
 2021-01-03 18:11:10 -07:00
silicons
b164d6e75b Merge pull request #13936 from BlueWildrose/hoodyhoodu 
Fixes loadout specific polychromic hoodies not having their hoods polychromable
 2021-01-03 18:10:44 -07:00
silicons
c3e4eed5c7 Merge pull request #13938 from timothyteakettle/funny-synths 
anthromorphic synth species
 2021-01-03 18:10:06 -07:00
silicons
c947dfdca5 Merge pull request #13940 from Chiirno/CargoParamedSuit 
Paramedic EVA suit now purchasable from Cargo
 2021-01-03 18:09:59 -07:00
silicons
2641332fb2 Merge pull request #13941 from Chiirno/ChemMixerHotfix 
Portable Chem Mixer now added to the Biological Technology tech node.
 2021-01-03 18:09:50 -07:00
silicons
0581748282 Merge pull request #13942 from YakumoChen/power-sink 
#13925 but doesn't underestimate engineering autism
 2021-01-03 18:09:38 -07:00
silicons
89913ebc18 Merge pull request #13943 from Hatterhat/imagine-modularizing 
utility uniform typos and making the capdrobe not suck
 2021-01-03 18:09:20 -07:00
silicons
d6bd5d4bac Merge pull request #13945 from DeltaFire15/synth-organ-printing 
Makes IPC cells & power cords printable
 2021-01-03 18:08:58 -07:00
silicons
0555756dde Merge pull request #13946 from uomo91/logfix 
[Port] Fixes log collisions
 2021-01-03 18:08:39 -07:00
silicons
697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items 
unlockable loadout items
 2021-01-03 18:07:18 -07:00
silicons
0bb0f89ca2 Update pen.dm 2021-01-03 18:03:36 -07:00
Chiirno
84d311e201 nightmare now oneshots glowshrooms, miner beacons, and console screens. 2021-01-03 02:44:47 -04:00