shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,281 Commits 5 Branches 0 Tags
aa2e11a417e0f38b439483799a071518d0337f6b
Commit Graph

26986 Commits

Author SHA1 Message Date
zeroisthebiggay aa2e11a417 medica medica medica medica 
medica medica medica medica
 2021-02-10 20:53:29 -05:00
zeroisthebiggay c3f0d0b9c8 fixes some bullshit assery 
fixes some bullshit assery
 2021-02-10 20:40:39 -05:00
zerothebigboy a2a8ab12c6 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 20:01:09 -05:00
zerothebigboy ec8029b0cc a couple more fixes 2021-02-10 20:00:04 -05:00
zeroisthebiggay 969ac7e5e4 now no longer wrong 
now no longer wrong
 2021-02-10 19:01:08 -05:00
zerothebigboy 00d7b0c9c9 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 18:57:05 -05:00
zerothebigboy de2e410c6f a bit more stuff 2021-02-10 18:55:56 -05:00
zeroisthebiggay 73020eba35 information here is wrong 
information here is wrong
 2021-02-10 14:27:14 -05:00
zerothebigboy 87eb447c10 some final touch ups 2021-02-10 14:22:04 -05:00
zeroisthebiggay e530e8d103 god i hate this 
god i hate this
 2021-02-10 13:05:21 -05:00
zerothebigboy d98b87bbe0 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 12:55:54 -05:00
zerothebigboy 058369a56d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi
 2021-02-10 12:55:45 -05:00
zeroisthebiggay 2645f0f953 back down to fifteen 
back down to fifteen
 2021-02-10 11:08:03 -05:00
silicons c8cf061773 Merge pull request #14211 from timothyteakettle/better-logging 
pickpocketing is now logged outside of hrefs
 2021-02-10 02:09:50 -07:00
silicons 4b089f3514 Merge pull request #14202 from DeltaFire15/robo-vendor 
Adds nanogel to the robodrobe
 2021-02-10 02:09:29 -07:00
silicons 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
silicons f0f9a865e6 Merge pull request #14204 from keronshb/powersinkobj-removal 
Removes the Power Sink Objective
 2021-02-10 02:09:09 -07:00
silicons e8da810cd3 Merge pull request #14205 from keronshb/warpimplant-adjustment 
Triples Warp Implant's cooldown
 2021-02-10 02:08:57 -07:00
silicons ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg 
sound PR oversights fix
 2021-02-10 02:07:57 -07:00
silicons 7c27de3735 Merge pull request #14216 from timothyteakettle/blood-fixes 
corrects two persistent blood related issues
 2021-02-10 02:07:49 -07:00
silicons ec2ae053ce Merge pull request #14215 from Putnam3145/readied-only 
Added a config to disallow unreadied players from voting on modes
 2021-02-10 02:07:37 -07:00
silicons c82f0a4f5b Merge pull request #14214 from Adelphon/gclothing 
Clothing PR
 2021-02-10 02:07:27 -07:00
zerothebigboy a93e089d2a two hours for aesthetics 2021-02-10 00:12:27 -05:00
zerothebigboy 097666a71a un 2021-02-09 18:49:45 -05:00
zerothebigboy 7d60d27a6f fun 2021-02-09 17:31:24 -05:00
Timothy Teakettle 09fdb5f83a Update apc_control.dm 2021-02-09 09:48:17 +00:00
Timothy Teakettle 5ebdb6deec yes 2021-02-09 09:37:17 +00:00
Putnam 7a6ed7f500 Added a config to disallow unreadied players from voting on modes/storytellers 2021-02-08 22:59:49 -08:00
Adelphon 28d1f93b1c Clothing PR 
I added two clothing that I made.
 2021-02-09 00:41:11 -05:00
zerothebigboy 85886f563f f 2021-02-08 16:59:54 -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 b3ab2722f0 fug 2021-02-08 14:48:53 +01: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
silicons 2fdc52828b Merge pull request #14200 from TyrianTyrell/master 
Update tongue.dm
 2021-02-08 03:03:15 -07:00
silicons 70155a8fb2 Merge pull request #14194 from Chiirno/WaddlersRiseUp 
Adds clown waddle to clown shoes.
 2021-02-08 03:02:40 -07:00
silicons 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
keronshb 38827122e9 Adjusts warp implant to 30 second delay 
who thought this was a good idea
 2021-02-07 23:50:42 -05:00
keronshb 952d2e1e60 Removes the power sink objective 
Alternative to the other PR
 2021-02-07 23:41:27 -05:00
zeroisthebiggay 0c0ff44c23 pog 
pog
 2021-02-07 22:01:57 -05:00
DeltaFire d482d387ee whoops 2021-02-07 18:24:18 +01:00
TyrianTyrell 7fff6a75c0 Update tongue.dm 2021-02-07 04:29:19 -05:00
silicons cf4a5f3388 Merge pull request #14189 from dzahlus/diversify-sound 
Diversify weapon sound
 2021-02-06 11:42:36 -07:00
silicons 86066450f3 Merge pull request #14179 from TyrianTyrell/master 
Signed language (Requested changes complete)
 2021-02-06 11:42:24 -07:00
silicons 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
timothyteakettle a9170aae93 Update priority_announce.dm 2021-02-06 17:42:37 +00:00
Lin 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