shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,507 Commits 5 Branches 0 Tags
d0beec1364e7b066fcfc67c33414c8f81db1fccd
Commit Graph
27136 Commits
Author SHA1 Message Date
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
dzahlus ec00c9ab0a i only see toxic gameplay with this objective 2021-02-12 17:28:42 +01:00
TyrianTyrellandGitHub a4bb96f614 Update good.dm 2021-02-12 07:02:14 -05: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
Hatterhat 7ec692ef60 this is good...isn't it? 2021-02-11 19:08:29 -06: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 8103078ff1 second pass pt2 2021-02-11 00:29:25 -06: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
zeroisthebiggayandGitHub aa2e11a417 medica medica medica medica 
medica medica medica medica
 2021-02-10 20:53:29 -05:00
zeroisthebiggayandGitHub 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
zeroisthebiggayandGitHub 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
Timothy Teakettle d858c420aa Update preferences_savefile.dm 2021-02-10 23:18:53 +00:00
zeroisthebiggayandGitHub 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
TyrianTyrellandGitHub 5769cc106b Update good.dm 2021-02-10 13:56:56 -05:00
zeroisthebiggayandGitHub 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
zeroisthebiggayandGitHub 2645f0f953 back down to fifteen 
back down to fifteen
 2021-02-10 11:08:03 -05: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 f0f9a865e6 Merge pull request #14204 from keronshb/powersinkobj-removal 
Removes the Power Sink Objective
 2021-02-10 02:09:09 -07:00
siliconsandGitHub e8da810cd3 Merge pull request #14205 from keronshb/warpimplant-adjustment 
Triples Warp Implant's cooldown
 2021-02-10 02:08:57 -07:00
siliconsandGitHub ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg 
sound PR oversights fix
 2021-02-10 02:07:57 -07:00
siliconsandGitHub 7c27de3735 Merge pull request #14216 from timothyteakettle/blood-fixes 
corrects two persistent blood related issues
 2021-02-10 02:07:49 -07:00
siliconsandGitHub 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
siliconsandGitHub 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