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

17701 Commits

Author SHA1 Message Date
TheSpaghetti
b52e8bf447 double punctuation bad 
no
 2021-01-09 00:18:15 -05:00
DeltaFire
56a2892fd3 sigh 2021-01-08 23:48:32 +01:00
Putnam3145
5cde6e0157 Merge pull request #13871 from silicons/debris 
Merry Christmas - GIVING JANITORS A JOB
 2021-01-08 00:26:52 -08:00
silicons
dc02c8cf74 Merge pull request #13967 from keronshb/blobtweaks 
Small blob tweaks + fix
 2021-01-08 01:20:23 -07:00
silicons
2c8326df35 Merge pull request #13976 from timothyteakettle/bread 
i have done nothing but teleport bread for three days
 2021-01-08 01:14:54 -07:00
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
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
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
Timothy Teakettle
44667ae1b6 edits 2021-01-07 16:46:42 +00: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
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
silicons
6c9c3cc2d8 Merge pull request #13968 from Arturlang/pray_sounds 
Ding for prayers
 2021-01-05 23:39:37 -07:00
timothyteakettle
a375448a54 fixes 2021-01-05 23:18:52 +00:00
Timothy Teakettle
535dede85b i teleported bread 2021-01-05 22:20:41 +00: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
keronshb
af3c8edf01 Small blob tweaks + fix 
Fixes the permanent consumption of a factory blob w/ blobbernaut failure.  Also changes resource blob pointgen from 1 to 2 and allows factory blobs to be placed across 5 tiles instead of 7.
 2021-01-04 12:32:41 -05:00
silicons
c937021b68 Update living_active_parry.dm 2021-01-04 03:17:51 -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
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
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
shellspeed1
c8ce23886c Update code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-01-02 22:10:36 -08:00
Putnam3145
f1b7c4aea5 Update miscellaneous.dm 2021-01-02 17:30:06 -08:00
Blue Wildrose
642c4a5806 erect up the config instead in case this situation comes up again. 2021-01-02 00:18:49 -07:00
Blue Wildrose
843b1494b3 max penis size increased before being punished for having one 2021-01-01 23:01:39 -07:00
Timothy Teakettle
dc44102d8b fix 2021-01-01 22:39:16 +00:00
Timothy Teakettle
974f46cb22 attempt to fix 2021-01-01 22:36:35 +00:00
Timothy Teakettle
813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
Chiirno
da5ea18c9a OK, compiling did something funky to the dm code? 2021-01-01 04:04:39 -04:00
Chiirno
bbeed2b8f0 I've done it, I've edited TgUI! 2021-01-01 04:00:35 -04:00