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

41279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 daa96f03df whoever merged their dumb fucking jacket pr and caused me merge conflicts is getting fucking KILLED 2021-02-10 13:01:12 -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
CitadelStationBot 13e0131cf8 Automatic changelog generation for PR #14211 [ci skip] 2021-02-10 03:09:54 -06: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 c9d917b22d Merge pull request #14201 from dzahlus/flechette-buff 
Flechette Rifle/CX Shredder now work with wounds
 2021-02-10 02:09:38 -07:00
CitadelStationBot 3b38c6af10 Automatic changelog generation for PR #14202 [ci skip] 2021-02-10 03:09:32 -06:00
silicons 4b089f3514 Merge pull request #14202 from DeltaFire15/robo-vendor 
Adds nanogel to the robodrobe
 2021-02-10 02:09:29 -07:00
CitadelStationBot 7260843691 Automatic changelog generation for PR #14203 [ci skip] 2021-02-10 03:09:23 -06: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
CitadelStationBot fb76225a40 Automatic changelog generation for PR #14204 [ci skip] 2021-02-10 03:09:12 -06:00
silicons f0f9a865e6 Merge pull request #14204 from keronshb/powersinkobj-removal 
Removes the Power Sink Objective
 2021-02-10 02:09:09 -07:00
CitadelStationBot 5045aff802 Automatic changelog generation for PR #14205 [ci skip] 2021-02-10 03:09:00 -06:00
silicons e8da810cd3 Merge pull request #14205 from keronshb/warpimplant-adjustment 
Triples Warp Implant's cooldown
 2021-02-10 02:08:57 -07:00
CitadelStationBot 9d0313b447 Automatic changelog generation for PR #14208 [ci skip] 2021-02-10 03:08:00 -06:00
silicons ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg 
sound PR oversights fix
 2021-02-10 02:07:57 -07:00
CitadelStationBot ac2c1e6c1f Automatic changelog generation for PR #14216 [ci skip] 2021-02-10 03:07:52 -06: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
CitadelStationBot ca3f48972c Automatic changelog generation for PR #14215 [ci skip] 2021-02-10 03:07:40 -06: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
CitadelStationBot 7bc503d66c Automatic changelog generation for PR #14214 [ci skip] 2021-02-10 03:07:29 -06:00
silicons c82f0a4f5b Merge pull request #14214 from Adelphon/gclothing 
Clothing PR
 2021-02-10 02:07:27 -07:00
zerothebigboy 2979563374 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 00:13:51 -05:00
zerothebigboy a93e089d2a two hours for aesthetics 2021-02-10 00:12:27 -05:00
zeroisthebiggay aa8b5210c7 i hope this works 
i hope this works
 2021-02-09 20:35:30 -05:00
zeroisthebiggay db5b35f1cc newline 
newline
 2021-02-09 18:57:50 -05:00
zerothebigboy 097666a71a un 2021-02-09 18:49:45 -05:00
zerothebigboy 7d60d27a6f fun 2021-02-09 17:31:24 -05:00
silicons 5c54bf39e7 Merge pull request #14217 from timothyteakettle/why 
[s] why
 2021-02-09 02:51:44 -07: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
Changelogs 69e4f7ff84 Automatic changelog compile [ci skip] 2021-02-09 00:13:10 +00:00
zerothebigboy 85886f563f f 2021-02-08 16:59:54 -05:00
Lin 7778ddaf96 Merge pull request #14195 from Citadel-Station-13/choker 
Donator Item - NT Choker
 2021-02-08 13:56:44 -06: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