shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,444 Commits 5 Branches 0 Tags
baf8b28f3a74c84ba4a3a0f99e46da80df71ccec
Commit Graph

17503 Commits

Author SHA1 Message Date
keronshb baf8b28f3a Fixes Reduced Diagnostics and adds disks 
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
 2019-12-29 16:03:38 -05:00
keronshb 390cfd8b64 Nanite ports from /tg/ 
Ports a couple of the newer nanite features from /tg/
 2019-12-28 16:56:17 -05:00
Ghom 2ad4698225 Merge pull request #10217 from Putnam3145/radiation 
Nerfing radioactive contamination
 2019-12-28 17:21:25 +01:00
Ghom d2c1eb3e47 Merge pull request #10299 from kappa-sama/patch-13 
sunflowers are no longer explosive
 2019-12-28 17:02:50 +01:00
Ghom fe78c98f71 Merge pull request #10297 from Hatterhat/tg-45547-luxbar 
the one with the luxury bar capsule
 2019-12-28 17:00:19 +01:00
Ghom a7ccd85bdb Merge pull request #10291 from Citadel-Station-13/kevinz000-patch-1 
fixes pai holochassis spam
 2019-12-28 13:15:42 +01:00
Lin d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471 
Ports some hud and update_icon code updates.
 2019-12-28 04:07:03 +00:00
kevinz000 139d4b4b3a ehh fine but why would you use this proc for that 2019-12-27 18:44:46 -08:00
Lin 80daaacc86 Merge pull request #10268 from Ghommie/Ghommie-cit487 
Effectively removes the old unused roboticist encryption key and headset.
 2019-12-28 00:08:24 +00:00
Lin be57c26acc Merge pull request #10289 from Ghommie/Ghommie-cit493 
[s] fixes a little door assembly glass dupe exploit
 2019-12-28 00:06:25 +00:00
Ghom 93248336ea Merge pull request #10265 from Trilbyspaceclone/map_redo 
Cit-iftyed Box map as well as adding back blasters back to armory
 2019-12-27 22:54:35 +01:00
Ghom 13fc20c7c3 Merge pull request #10296 from Useroth/ghostcafe 
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
 2019-12-27 16:30:13 +01:00
Useroth a3776fb966 Small touch-up. 2019-12-27 16:05:07 +01:00
Useroth c3298d525f Good idea, tbh. 2019-12-27 15:57:49 +01:00
Ghom afd22cf618 Merge pull request #10298 from kappa-sama/patch-12 
nerfs chain smokers, removes stocks
 2019-12-27 13:37:38 +01:00
Ghom 5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain 
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
 2019-12-27 13:27:04 +01:00
Seris02 b4b6e550e4 Merge branch 'wintercoatsagain' of https://github.com/Seris02/Citadel-Station-13 into wintercoatsagain 2019-12-27 18:10:51 +08:00
Seris02 8ed4fe9c05 changes 2019-12-27 18:09:30 +08:00
kappa-sama e97ca5f924 yeah fair enough 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-26 14:22:03 -05:00
kappa-sama 1dcee075e6 f 2019-12-26 14:20:43 -05:00
Useroth 35846c452a Applied suggestions and minor tweaks. 2019-12-26 20:03:43 +01:00
Ghom 05bde370ec Merge pull request #10250 from Michiyamenotehifunana/polyshorts-for-digis 
Gives Polychromic Shorts a Digitigrade Worn Icon State and Modernizes Polychromic Clothing Code
 2019-12-26 16:11:54 +01:00
Ghom 12d0a2ee4c Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head 
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
 2019-12-26 16:07:45 +01:00
Ghom 512d046f18 Merge pull request #10128 from Seris02/clownheadset 
gives the clown a headset with a clown megaphone loudmode
 2019-12-26 13:58:45 +01:00
Seris02 e125dae871 yee 2019-12-26 16:36:01 +08:00
kappa-sama 4689d805a3 e 2019-12-26 02:54:38 -05:00
Hatterhat 940efc0c1c holy shit i hope this compiles 2019-12-26 01:46:04 -06:00
Useroth cbff758d1a Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility. 2019-12-26 07:49:48 +01:00
Lin 5670276c70 Merge pull request #10237 from Ghommie/Ghommie-cit479 
Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.
 2019-12-25 19:06:46 +00:00
Lin 1931a2f715 Merge pull request #10242 from Ghommie/Ghommie-cit483 
Ports "Refactors can_see_reagents"
 2019-12-25 19:03:42 +00:00
kevinz000 8dd67afb9c Update pai_defense.dm 2019-12-24 23:43:16 -08:00
Ghommie 6a5a917944 [s] fixes a little door assembly glass dupe exploit 2019-12-25 07:00:53 +01:00
Ghom e7cf680ca7 Merge pull request #10266 from shellspeed1/master 
New insect marking customization option and three new wings.
 2019-12-25 03:43:29 +01:00
Seris02 a106fde6cc a few fixes here and there and updating it 2019-12-24 23:38:27 +08:00
Seris02 85c5a5dfa1 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-12-24 22:29:46 +08:00
Seris02 9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass 2019-12-24 22:27:41 +08:00
Hatterhat d1c96237a6 the very shitty idea: "muh speedloader" 2019-12-24 04:16:33 -06:00
Hatterhat 681508482c magazine metal cost tweaks, speedloader in AIB 2019-12-24 04:15:25 -06:00
Lin a0b90158c4 Merge pull request #10269 from Ghommie/Ghommie-cit488 
Fix goose meat.
 2019-12-24 00:56:07 +00:00
TrilbySpaceClone ec0596c404 Update 2019-12-23 18:52:33 -05:00
Ghom 9a022f21eb Merge pull request #10245 from r4d6/substationV2 
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
 2019-12-23 18:58:26 +01:00
r4d6 0a3e370a93 Move the config up to avoid conflict 2019-12-23 12:45:40 -05:00
r4d6 01a8fe1cd6 Add config options 2019-12-23 12:41:52 -05:00
r4d6 b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn"" 
This reverts commit d851beea16.
 2019-12-23 10:25:37 -05:00
r4d6 d851beea16 Revert "Add the option to restrict the Engine that spawn" 
This reverts commit e3e1f91635.
 2019-12-23 10:23:55 -05:00
r4d6 e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -05:00
Ghom 37a6abd889 Merge pull request #10274 from kappa-sama/kappa-sama-patch-1 
no more 40% time dilation from broodmother
 2019-12-23 13:41:10 +01:00
kevinz000 1b9b54b33d Merge pull request #10267 from Ghommie/Ghommie-cit486 
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
 2019-12-23 00:44:42 -08:00
Ghommie 187b9bb13a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483 2019-12-23 05:10:38 +01:00
Seris02 382c5d057a updates ratvar coat 2019-12-23 12:02:05 +08:00