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

13653 Commits

Author SHA1 Message Date
kevinz000 ddd00b1981 Merge pull request #11572 from DeltaFire15/clockies-vanguardstam 
Clockie Vanguard Spell - rebalance for stamcombat
 2020-03-23 10:37:42 -07:00
kevinz000 fbe77495e8 Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020 
Porting Juices, Drinks, and Salami [READY]
 2020-03-23 10:36:44 -07:00
kevinz000 dfec544d71 Merge pull request #11578 from Ghommie/Ghommie-cit636 
Fixing owner not being set in mutation/on_aquiring.
 2020-03-23 10:36:17 -07:00
kevinz000 57429493c6 Merge pull request #11581 from Ghommie/Ghommie-cit637 
M/F body preferences.
 2020-03-23 10:34:02 -07:00
kappa-sama 1d2264849e meh (#11584) 2020-03-23 15:50:53 +01:00
zeroisthebiggay f5a96241ab sneaksuits are not fireproof (#11573) 
* and i wanna die

* i decide to revert

* a a a a
 2020-03-23 15:47:41 +01:00
Putnam3145 a5224b0b8b Merge pull request #11568 from Ghommie/Ghommie-cit634 
Two runtimes, one fix.
 2020-03-23 00:03:23 -07:00
Winter Flare 29576ee6a7 Travis Please 2020-03-22 20:34:38 -04:00
Winter Flare 0effeb6ed5 Ports Hyper Drinks 
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
 2020-03-22 19:33:50 -04:00
Ghommie c798b31d6f bodyparts cache aaaaa. 2020-03-22 22:20:26 +01:00
Winter Flare 9d9720ed21 QoL Vendor Reorganisation 
Moves Bowls and Glasses to top of vendors.
 2020-03-22 15:30:29 -04:00
Winter Flare cd3f8f5df5 Porting More Stuff 
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
 2020-03-22 15:13:00 -04:00
Ghommie 76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Ghommie 3c2cb76792 Fixing owner not being set in mutation/on_aquiring. 2020-03-22 15:23:05 +01:00
kevinz000 82cf7e584b Update SDQL_2_wrappers.dm (#11552) 2020-03-22 13:40:31 +01:00
Xantholne 71fc6bc693 Fixes bumbles resting (#11564) 
* Fixes bumbles resting

* Update code/modules/mob/living/simple_animal/friendly/bumbles.dm

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

* Update bumbles.dm

* Update bumbles.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-22 13:12:14 +01:00
Putnam3145 368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549) 
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
 2020-03-22 13:02:23 +01:00
Putnam3145 5147536eb3 yeah whoops that should go (#11561) 2020-03-22 13:01:51 +01:00
Winter Flare 5c3037b5d0 Fixed Several Foods, Strawberry Juice 
Add Strawberry Juice
Port Salami
https://github.com/tgstation/tgstation/pull/48817
https://github.com/tgstation/tgstation/pull/49228
Ports some TG Drinks
https://github.com/tgstation/tgstation/pull/48783

Made lizards like:
Egg Wrap

Tweaked Soda Dispenser
Moved Egg Wraps
Tweaked Strawberry Tea and Strawberry Milk recipies.
 2020-03-22 00:19:28 -04:00
DeltaFire 513c499dec Vanguard: 30 stamregen / second, 50% stamlossfeedback 
Modifies vanguard to actually fit into a combat system with stamina, since it didn't have any real thing for stamregen despite explicitly stating it caused increased stamregen. Incredible.
 2020-03-22 00:44:59 +01:00
Ghommie 7747c84b71 Two runtimes, one fix. 2020-03-21 23:23:31 +01:00
kevinz000 c7e634b8c8 Merge pull request #11565 from Citadel-Station-13/Ghommie-patch-1 
Fixing permanent slapstick comedy creamed overlay.
 2020-03-21 10:30:12 -07:00
Auris456852 7c94b555ae Kills screen-wide EMPs (#11375) 
* Kills screen-wide EMPs

This makes a small line change to make the EMP reaction's size be determined logarithmically, rather than linearly. That meaning, there's diminishing returns on EMPs. As a consequence, there's not TOO much reason to try to make a very big EMP, like with maxcaps (before toxins became research, anyway), though I'm sure some of you, who like to get the largest numbers on things possible, can still reach some ungodly numbers with payloads. You're welcome to reach for new heights, but you shouldn't be able to lolEMP the entire station.

* EMP shrinking 2
 2020-03-21 16:09:24 +01:00
kevinz000 0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376) 
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

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

* Update code/modules/mob/living/living_combat.dm

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

* Update code/modules/mob/living/living_combat.dm

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

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-21 16:04:26 +01:00
kevinz000 87314b5d4d Merge pull request #11530 from Ghommie/Ghommie-cit629 
shapes and sizes sanitized.
 2020-03-21 07:32:53 -07:00
necromanceranne 94c700a06c NVG Nerf/Syndicate NVG Buff (#11548) 
* nerfs the shit out of nvg and gives syndicate special flashproof versions

* forgot about this one

* bleh
 2020-03-21 15:31:59 +01:00
Trilbyspaceclone 2bfc9b8ef8 Gutlunchs now like to eat bodys a bit more! (#11545) 
* Update gutlunch.dm

* hey what if we didnt just port a semi fix...
 2020-03-21 15:07:32 +01:00
Ghommie 6c6b2a42eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit629 2020-03-21 15:04:35 +01:00
Ghom cf4f7a705d Update human.dm 2020-03-21 14:52:16 +01:00
ZeroMan 6c5160ee5c i hurt myself today 2020-03-21 02:18:44 -04:00
ZeroMan 93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies 
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
 2020-03-21 02:17:13 -04:00
kevinz000 cc8d8da0fe Merge pull request #11531 from Ghommie/Ghommie-cit630 
Removing some egg-celent unused preferences.
 2020-03-20 22:56:19 -07:00
kevinz000 8a8b6efb39 Merge pull request #11537 from Trilbyspaceclone/patch-317 
Badass Glasses
 2020-03-20 22:54:28 -07:00
kevinz000 2127d4d7d4 Merge pull request #11542 from Trilbyspaceclone/patch-318 
Buffs Syndi Medical borgs
 2020-03-20 22:48:23 -07:00
kevinz000 4eaa3a22c2 fixes beam rifles and some micro optimizations to projectiles and readds the chameleon gun for debugging (#11528) 
* wew

* ah

* k

* k

* faster
 2020-03-21 02:45:34 +01:00
ZeroMan 5039bcad7e i need an ambulance 2020-03-20 13:39:20 -04:00
ZeroMan b30f10742b i actually am hurt 2020-03-20 13:38:08 -04:00
ZeroMan bc5e850516 i still feel pain 2020-03-20 13:35:55 -04:00
ZeroMan 96d897a0fb i hurt myself today 2020-03-20 13:33:07 -04:00
kevinz000 225d5a3c40 Nerfs HoS taser and warden stun pump action blaster (#11352) 
* Update stun.dm

* Update pumpenergy.dm
 2020-03-20 16:09:10 +01:00
Putnam3145 6fffb4045b Make mass hallucination more admemeable (#11491) 
* Make mass hallucination more admemeable

* makes it work

* Update code/modules/events/mass_hallucination.dm

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-20 16:08:11 +01:00
necromanceranne 570f6e8a66 Plastitanium Rapier: Sleepy Edition (#11507) 
* knockout rapier, improved sprites

* it's a rapier not a foil those aren't synonyms

* whoops

* needs it's shanking sound

* Put a stamina loss threshold onto the swords slep so you need at least two hits to proc the sleep. Don't get stabbed more than once!

* Update items_and_weapons.dmi

* Removes chat spam and also frankly it doesn't need drowzy on top
 2020-03-20 16:07:04 +01:00
Trilbyspaceclone 7ad1831b44 Update fermenting_barrel.dm (#11534) 2020-03-20 15:52:09 +01:00
Putnam3145 9523954c4d Rewrote waffle traitor flavor text (#11539) 
* Rewrote waffle flavor text

* and not in custody
 2020-03-20 15:47:46 +01:00
Trilbyspaceclone 9d0dbb38f8 Update robot_modules.dm 2020-03-20 01:52:43 -04:00
Trilbyspaceclone 95e0f0399a Update tools.dm 2020-03-20 01:47:42 -04:00
ZeroMan dd40bc28c1 and here we go 2020-03-19 22:17:43 -04:00
kevinz000 6e84781670 tasers are now as fast as disablers and 7 --> 14 tile range but do not have impact damage (#11351) 
* Update stun.dm

* Update stun.dm

* Update stun.dm

* Update debuffs.dm
 2020-03-20 03:15:03 +01:00
ZeroMan 35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
kevinz000 8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628 
More bug reports yee'd their last haw.
 2020-03-19 18:56:32 -07:00