shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,392 Commits 5 Branches 0 Tags
9b6cd54abf9377e8d424d57ebb1aefbeecb59bcd
Commit Graph

32392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kiwedespars 9b6cd54abf there's an extra space and it bugged me im sorry 2020-04-02 00:35:38 -07:00
kiwedespars eeccea989c purple nerf - light pink gets epi back 2020-04-02 00:34:44 -07:00
kiwedespars d9e8db8a6c Update _status_effects.dm 2020-04-01 23:31:51 -07:00
CitadelStationBot abc4b5d331 Automatic changelog generation for PR #11677 [ci skip] 2020-03-30 16:50:38 -05:00
kevinz000 2521aa4973 Merge pull request #11677 from actioninja/wooow-glow 
Better glowing lights
 2020-03-30 14:50:36 -07:00
CitadelStationBot 994712193e Automatic changelog generation for PR #11691 [ci skip] 2020-03-30 16:24:54 -05:00
kevinz000 6e140f003c cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside (#11691) 
* Update cloning.dm

* Update traits.dm

* Update life.dm

* Update code/__DEFINES/traits.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-30 23:24:51 +02:00
Lin 4eaf8882f3 Merge pull request #11670 from Citadel-Station-13/Ghommie-patch-2 
fixing no grav limbless slowdown
 2020-03-30 19:57:14 +00:00
kevinz000 15ca26f263 Merge pull request #11684 from Ghommie/Ghommie-cit653 
Bumps up dreamchecker version
 2020-03-30 11:29:41 -07:00
CitadelStationBot 43ca451b59 Automatic changelog generation for PR #11663 [ci skip] 2020-03-30 10:54:12 -05:00
Trilbyspaceclone 0f32cbaa31 28 days ago (#11663) 2020-03-30 17:54:09 +02:00
CitadelStationBot 08101604a5 Automatic changelog generation for PR #11668 [ci skip] 2020-03-30 10:52:34 -05:00
kappa-sama 2eda92ed73 yeah (#11668) 2020-03-30 17:52:31 +02:00
Putnam3145 41904dccaf Merge pull request #11690 from Citadel-Station-13/kevinz000-patch-1 
changes 60 * 4 * 10 to 4 MINUTES because this hurts to read
 2020-03-30 03:04:04 -07:00
kevinz000 877b7f699e Update syndicate_contract.dm 2020-03-29 23:40:52 -07:00
CitadelStationBot 02d32d17c2 Automatic changelog generation for PR #11660 [ci skip] 2020-03-29 22:42:45 -05:00
kevinz000 0cee7c9675 Merge pull request #11660 from deathride58/fuckcontractors 
Quick and dirty PR to make contractor targets actually show up in the traitor panel
 2020-03-29 20:42:43 -07:00
CitadelStationBot c1355c0df8 Automatic changelog generation for PR #11631 [ci skip] 2020-03-29 22:42:13 -05:00
kevinz000 8847fd4210 Merge pull request #11631 from KathrinBailey/Kat'sBoxRework 
Adds radiation shuttters and new posters to maps; fixes (new?) bugs; fixes windowed shutter.
 2020-03-29 20:42:11 -07:00
KathrinBailey b6202ad5a5 Gives shutters glass so the close proc doesn't change opacity 2020-03-30 02:36:27 +01:00
KathrinBailey f4d304bfcf I FORGOT TO RE-ADD HOOCHMASTER AGAIN 
HOW COULD I DO THIS poor hoochmaster I am so so sorry this is the second time I am sorry bartender mains.
 2020-03-30 01:29:44 +01:00
KathrinBailey 3f800c179c map merged should be no conflicts? 2020-03-30 01:08:45 +01:00
KathrinBailey d27c802859 wait so I literally copied from master and did stuff again and it has merge conflicts, do not merge until another commit goes through 2020-03-30 00:44:59 +01:00
KathrinBailey b52f8148cb Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework 2020-03-30 00:32:31 +01:00
KathrinBailey b3750207e9 Merge Conflicts 
Changes redone.
 2020-03-30 00:11:34 +01:00
Ghommie c9aea0b725 Bumps up dreamchecker version (possible incoming warnings from the linter) 2020-03-29 18:10:54 +02:00
deathride58 d1d090ae6f adds a length check for if the assigned targets list spontaneously deletes itself 2020-03-29 11:54:49 -04:00
CitadelStationBot c6889ad8ee Automatic changelog generation for PR #11675 [ci skip] 2020-03-29 10:45:04 -05:00
necromanceranne a4313ee101 Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink (#11675) 2020-03-29 17:45:01 +02:00
CitadelStationBot 41557d4dbf Automatic changelog generation for PR #11673 [ci skip] 2020-03-29 10:22:06 -05:00
necromanceranne aa01c30656 Removes some weapons and crates that shouldn't have been added, like, ever (#11673) 2020-03-29 17:22:03 +02:00
CitadelStationBot 8a2baea426 Automatic changelog generation for PR #11674 [ci skip] 2020-03-29 10:20:41 -05:00
necromanceranne cd9a782d9f Double-barreled shotgun and their children now can be used with off-hand weapons (#11674) 2020-03-29 17:20:39 +02:00
CitadelStationBot 701187451d Automatic changelog generation for PR #11671 [ci skip] 2020-03-29 10:19:29 -05:00
necromanceranne 02a8104c3b Makes taserslugs actually tasers, makes mech scattershot not a oneshot (#11671) 2020-03-29 17:19:27 +02:00
CitadelStationBot 71daf03699 Automatic changelog generation for PR #11672 [ci skip] 2020-03-29 10:17:00 -05:00
necromanceranne 3ddfbe0e29 Null Crate removal (#11672) 2020-03-29 17:16:58 +02:00
CitadelStationBot e3e6f38285 Automatic changelog generation for PR #11679 [ci skip] 2020-03-29 10:09:28 -05:00
kevinz000 49416886a1 Update turf.dm (#11679) 2020-03-29 17:09:26 +02:00
kevinz000 4eb2fb531a Update sword_point.dm (#11678) 2020-03-29 15:03:08 +02:00
Rob Bailey ff9f77eb8c uuh whatever 2020-03-28 23:57:15 -07:00
actioninja abde27c098 layer changes 2020-03-28 23:50:08 -07:00
actioninja f419653c28 functionality 2020-03-28 23:50:06 -07:00
CitadelStationBot 2c39b14f5c Automatic changelog generation for PR #11656 [ci skip] 2020-03-28 21:06:12 -05:00
Lin 659873979f Merge pull request #11656 from Xantholne/bumbleswakeup 
Bumbles my man, you gotta stop sleeping for more than 8 hours it's bad for your health
 2020-03-29 02:06:09 +00:00
CitadelStationBot c314703d38 Automatic changelog generation for PR #11606 [ci skip] 2020-03-28 20:53:34 -05:00
Trilbyspaceclone 942034df51 Makes a few space ruins hard spawn (#11606) 
* Update space.dm

* off with the sawed-in-half ruin

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-29 03:53:31 +02:00
Ghom 1ab929c7c9 fixing no grav limbless slowdown 2020-03-29 00:58:33 +01:00
CitadelStationBot 2c3ca418ef Automatic changelog generation for PR #11653 [ci skip] 2020-03-28 18:02:10 -05:00
kevinz000 9595df3e18 Merge pull request #11653 from zeroisthebiggay/holoparsiteportsarefunny 
ports tg holoparasite customizations
 2020-03-28 16:02:08 -07:00