shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,453 Commits 5 Branches 0 Tags
b4b50f5c41db44f9872895ce034bf836b8d73aa9
Commit Graph
18155 Commits
Author SHA1 Message Date
siliconsandGitHub 76837ee0b6 Merge pull request #14225 from Hatterhat/dth-kit-pass2 
[hello if someone could fight the maintainers to take a look that'd be great] fixes durathread armor kits
 2021-02-12 18:54:36 -07:00
dzahlus c40427da05 i hate changelings 
i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings
 2021-02-12 19:23:59 +01:00
dzahlus eacf1ef40b dynamic still has permakill obj but i aint touching dynamic code 2021-02-12 19:20:22 +01:00
dzahlus 806d96076e i dont actually know how to code btw 2021-02-12 18:41:58 +01:00
dzahlus 70303319f4 hrnngh CTRL+S doesnt save everything 2021-02-12 18:26:52 +01:00
dzahlus 503c276f9f uh second try 2021-02-12 18:25:03 +01:00
DeltaFireandGitHub 1ea3aafa10 Merge pull request #14166 from Hatterhat/ebola-nerf 
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
 2021-02-12 05:06:48 +01:00
DeltaFire 06101ee9c8 sigh 2021-02-12 03:30:15 +01:00
DeltaFire b0ff405a13 cool 2021-02-12 03:06:53 +01:00
DeltaFire fb4641b348 e 2021-02-12 02:42:59 +01:00
LinandGitHub 61877a3d1c Merge pull request #14223 from timothyteakettle/quieten-a-log 
changes a migration error to use log_game instead of message_admins
 2021-02-11 19:02:44 -06:00
DeltaFire 5afa573fa6 sigh 
sigh
 2021-02-12 00:50:42 +01:00
Adelphon 919e23c122 More Clothes 2021-02-11 02:36:50 -05:00
Hatterhat 3040eca4e0 holy shit what was i thinking god FUCK durathread 2021-02-11 00:20:49 -06:00
DeltaFireandGitHub 7259f53160 Merge pull request #14206 from Citadel-Station-13/silicons-patch-10 
Nerfs VoG stun, knockdown, vomit. Removes sleep command.
 2021-02-11 04:32:37 +01:00
DeltaFire 7fbb41eee0 screaming 2021-02-11 04:12:42 +01:00
Timothy Teakettle d858c420aa Update preferences_savefile.dm 2021-02-10 23:18:53 +00:00
siliconsandGitHub c8cf061773 Merge pull request #14211 from timothyteakettle/better-logging 
pickpocketing is now logged outside of hrefs
 2021-02-10 02:09:50 -07:00
siliconsandGitHub 4b089f3514 Merge pull request #14202 from DeltaFire15/robo-vendor 
Adds nanogel to the robodrobe
 2021-02-10 02:09:29 -07:00
siliconsandGitHub 74a7c1e9fb Merge pull request #14203 from zeroisthebiggay/patch-4 
makes the a.sterile mask no longer hide your face
 2021-02-10 02:09:20 -07:00
siliconsandGitHub ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg 
sound PR oversights fix
 2021-02-10 02:07:57 -07:00
Adelphon 28d1f93b1c Clothing PR 
I added two clothing that I made.
 2021-02-09 00:41:11 -05:00
Timothy Teakettle e433c0b172 Update living.dm 2021-02-08 17:04:55 +00:00
Timothy Teakettle 3d97c1fb89 log fix 2021-02-08 17:00:26 +00:00
Timothy Teakettle b7e9169257 Update human.dm 2021-02-08 16:44:02 +00:00
dzahlus 6dabe348fa fixes oversights 
fixes grenadelauncher.ogg being used where it shouldnt FOR GOOD NOW I SWEAR. Bokken sound fixed, mech weapons now use proper sound too
 2021-02-08 14:43:33 +01:00
siliconsandGitHub b1ce9a9618 Update vocal_cords.dm 2021-02-08 03:09:19 -07:00
siliconsandGitHub 0895789217 Update vocal_cords.dm 2021-02-08 03:06:54 -07:00
siliconsandGitHub 2fdc52828b Merge pull request #14200 from TyrianTyrell/master 
Update tongue.dm
 2021-02-08 03:03:15 -07:00
siliconsandGitHub 70155a8fb2 Merge pull request #14194 from Chiirno/WaddlersRiseUp 
Adds clown waddle to clown shoes.
 2021-02-08 03:02:40 -07:00
siliconsandGitHub a3187e8216 Merge pull request #14196 from timothyteakettle/sentient-virus 
sentient viruses can now infect synths and ipcs (fastest salt in the west)
 2021-02-08 03:02:31 -07:00
zeroisthebiggayandGitHub 0c0ff44c23 pog 
pog
 2021-02-07 22:01:57 -05:00
DeltaFire d482d387ee whoops 2021-02-07 18:24:18 +01:00
TyrianTyrellandGitHub 7fff6a75c0 Update tongue.dm 2021-02-07 04:29:19 -05:00
siliconsandGitHub cf4a5f3388 Merge pull request #14189 from dzahlus/diversify-sound 
Diversify weapon sound
 2021-02-06 11:42:36 -07:00
siliconsandGitHub 86066450f3 Merge pull request #14179 from TyrianTyrell/master 
Signed language (Requested changes complete)
 2021-02-06 11:42:24 -07:00
siliconsandGitHub 08356ee7f7 Merge pull request #13966 from Thalpy/Dispencer-UI-change 
[Ready] Fixes and tweaks for the chemistry machine suite
 2021-02-06 11:41:08 -07:00
LinandGitHub fe263ae2ff Merge pull request #13890 from silicons/parry 
ablative parry armwraps
 2021-02-05 23:52:18 -06:00
Fermi f236b2da29 Merge branch 'master' into Dispencer-UI-change 2021-02-06 02:40:27 +00:00
Timothy Teakettle 4b51174717 Update disease_disease.dm 2021-02-05 16:43:18 +00:00
DeltaFireandGitHub bbcf23fae9 Merge pull request #14182 from Citadel-Station-13/silicons-patch-8 
i hate xenobiology players
 2021-02-05 16:09:58 +01:00
SmArtKar 18a82a242f CI 2021-02-05 12:20:18 +03:00
SmArtKar c9e97986c8 Patches, fixes, NUCLEAR CARDS 2021-02-05 12:13:38 +03:00
siliconsGitHubDeltaFire
 		3f4aff09d1 Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-02-05 00:59:19 -07:00
Chiirno e58f170057 begrudgingly added ctrl+click to the examine info. 2021-02-04 19:37:34 -04:00
Chiirno c85e381169 Waddlers rise upgit add * 2021-02-04 18:25:37 -04:00
raspy-on-osu a7dd74201c 2 2021-02-04 16:51:06 -05:00
raspy-on-osu 3a3b3966a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ventcrawling-refactor-fix2 2021-02-04 16:46:37 -05:00
siliconsandGitHub 89c63a243f Update card.dm 2021-02-04 13:23:03 -07:00
TyrianTyrellandGitHub d1b7b191d2 Update preferences_savefile.dm 2021-02-04 15:14:20 -05:00