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

21001 Commits

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
kevinz000
2521aa4973 Merge pull request #11677 from actioninja/wooow-glow 
Better glowing lights
 2020-03-30 14:50:36 -07: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
kappa-sama
2eda92ed73 yeah (#11668) 2020-03-30 17:52:31 +02:00
kevinz000
877b7f699e Update syndicate_contract.dm 2020-03-29 23:40:52 -07: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
KathrinBailey
b6202ad5a5 Gives shutters glass so the close proc doesn't change opacity 2020-03-30 02:36:27 +01:00
deathride58
d1d090ae6f adds a length check for if the assigned targets list spontaneously deletes itself 2020-03-29 11:54:49 -04: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
necromanceranne
aa01c30656 Removes some weapons and crates that shouldn't have been added, like, ever (#11673) 2020-03-29 17:22:03 +02: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
necromanceranne
02a8104c3b Makes taserslugs actually tasers, makes mech scattershot not a oneshot (#11671) 2020-03-29 17:19:27 +02:00
necromanceranne
3ddfbe0e29 Null Crate removal (#11672) 2020-03-29 17:16:58 +02: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
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
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
kevinz000
9595df3e18 Merge pull request #11653 from zeroisthebiggay/holoparsiteportsarefunny 
ports tg holoparasite customizations
 2020-03-28 16:02:08 -07:00
kevinz000
6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650 
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
 2020-03-28 16:00:48 -07:00
kevinz000
0aebf68df0 Merge pull request #11651 from zeroisthebiggay/donotreviveme 
ghosts can now DNR
 2020-03-28 16:00:08 -07:00
kevinz000
9797089f0c Merge pull request #11650 from Ghommie/Ghommie-cit649 
Ports "Adds spam prevention to clients"
 2020-03-28 15:59:40 -07:00
kevinz000
015371800c Merge pull request #11649 from Ghommie/Ghommie-cit648 
infiltrator sneaky boots fix.
 2020-03-28 15:59:10 -07:00
kevinz000
dd90d21f93 Merge pull request #11645 from Trilbyspaceclone/vaild 
Et tu?
 2020-03-28 15:58:56 -07:00
kevinz000
cf24117c77 Merge pull request #11639 from Citadel-Station-13/Ghommie-patch-1 
Makes Envy knife amongst other dna disguise shenanigeans actually update the gender.
 2020-03-28 15:58:29 -07:00
kevinz000
938ad42735 Merge pull request #11636 from Trilbyspaceclone/patch-325 
Medical Mechs syringe gun now innately know more healing chems
 2020-03-28 15:58:14 -07:00
Putnam3145
8a620b0ebc More dynamic rework: help I wasn't done (#11642) 
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

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

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-28 14:46:37 +01:00
deathride58
354ca22c9a Makes contractor targets actually show up in the traitor panel 2020-03-28 00:28:44 -04:00
kevinz000
eb84d426e1 Merge pull request #11634 from Ghommie/Ghommie-cit645 
Fixing a couple issues with sofas.
 2020-03-27 21:25:31 -07:00
kevinz000
39e2ae7d1f Merge pull request #11629 from Seris02/nomoreblowingborgs 
stops hijackers from being able to remotely blow up borgs (probably)
 2020-03-27 21:23:54 -07:00
Ghom
a85d590b1d Update bumbles.dm 2020-03-28 03:35:12 +01:00
Ghom
09608dee5f Update split_personality.dm 2020-03-28 03:30:36 +01:00
Unknown
013e591218 Bumbles wake up sleepy head 2020-03-27 20:22:22 -06:00
ZeroMan
9f6c97c63f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into donotreviveme 2020-03-27 22:10:42 -04:00
ZeroMan
6e6d8b5098 didnt port this properly 2020-03-27 22:07:48 -04:00
ZeroMan
dba359cbaa commit not alive immediately 2020-03-27 20:51:04 -04:00
Putnam3145
b5c4124d7a Merge pull request #11638 from Ghommie/Ghommie-cit646 
Moderately unoriginal PR title about runtime errors.
 2020-03-27 17:12:49 -07:00
kevinz000
06bc8073cb Merge pull request #11614 from Citadel-Station-13/Ghommie-patch-2 
Quick webedit fixing an issue with the split personality.
 2020-03-27 16:32:29 -07:00
ZeroMan
54bce5ecc6 i am hol horse 2020-03-27 18:23:18 -04:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
ZeroMan
7b34ebc9b5 commit not alive immediately 2020-03-27 17:13:45 -04:00
Ghommie
9ab0cccdec porting stuff 2020-03-27 19:52:33 +01:00
Ghommie
f7ce5e5de3 infiltrator sneaky shoes fix. 2020-03-27 14:42:23 +01:00
Putnam3145
1a6107a518 Removed nymphomania, plus code cleanup (#11641) 2020-03-27 14:03:05 +01:00