1a7e812d55
wip
2020-03-24 19:51:23 -07:00
2e0992dbb9
k
2020-03-24 19:29:54 -07:00
d139234c6d
my smooth brain hurts
2020-03-23 16:06:40 -07:00
fa9c1dfd6c
start
2020-03-23 16:05:22 -07:00
bf0970d8c3
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-23 15:34:04 -07:00
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
cc80d463b7
Merge pull request #11536 from Trilbyspaceclone/patch-316
...
Water and Unholy water tweaks
2020-03-23 10:40:19 -07:00
33317e20fe
Merge pull request #11570 from zeroisthebiggay/contractorrandomitemspowergaming
...
moves sneaksuit to bundles, removes useless contractor items, adds sneaksuit to contractor pool of random items
2020-03-23 10:38:22 -07:00
3990b1f4c9
Merge pull request #11571 from Ghommie/Ghommie-cit635
...
Size preferences made configurable.
2020-03-23 10:37:54 -07:00
ddd00b1981
Merge pull request #11572 from DeltaFire15/clockies-vanguardstam
...
Clockie Vanguard Spell - rebalance for stamcombat
2020-03-23 10:37:42 -07:00
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
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
57429493c6
Merge pull request #11581 from Ghommie/Ghommie-cit637
...
M/F body preferences.
2020-03-23 10:34:02 -07:00
1d2264849e
meh ( #11584 )
2020-03-23 15:50:53 +01:00
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
a5224b0b8b
Merge pull request #11568 from Ghommie/Ghommie-cit634
...
Two runtimes, one fix.
2020-03-23 00:03:23 -07:00
29576ee6a7
Travis Please
2020-03-22 20:34:38 -04:00
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
a6ca854e5c
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-22 15:07:41 -07:00
c798b31d6f
bodyparts cache aaaaa.
2020-03-22 22:20:26 +01:00
9d9720ed21
QoL Vendor Reorganisation
...
Moves Bowls and Glasses to top of vendors.
2020-03-22 15:30:29 -04:00
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
76ff0d4931
M/F body preferences.
2020-03-22 19:47:48 +01:00
3c2cb76792
Fixing owner not being set in mutation/on_aquiring.
2020-03-22 15:23:05 +01:00
82cf7e584b
Update SDQL_2_wrappers.dm ( #11552 )
2020-03-22 13:40:31 +01:00
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
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
5147536eb3
yeah whoops that should go ( #11561 )
2020-03-22 13:01:51 +01:00
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
b43f7c10be
Savefiles vs admin shenanigeans...
2020-03-22 04:30:45 +01:00
ebfa9d6b84
Very tentative attempt at figuring out what's wrong.
2020-03-22 04:21:00 +01:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
6d4433dd77
Size preferences made configurable.
2020-03-22 01:07:51 +01:00
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
a5f988e0be
fuck me up fam
2020-03-21 19:43:43 -04:00
7747c84b71
Two runtimes, one fix.
2020-03-21 23:23:31 +01:00
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
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -07:00
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
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
87314b5d4d
Merge pull request #11530 from Ghommie/Ghommie-cit629
...
shapes and sizes sanitized.
2020-03-21 07:32:53 -07:00
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
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
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
cf4f7a705d
Update human.dm
2020-03-21 14:52:16 +01:00
f58bad79ec
Update other_reagents.dm
2020-03-21 02:18:57 -04:00
6c5160ee5c
i hurt myself today
2020-03-21 02:18:44 -04:00
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
6754b794b1
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-20 22:59:17 -07:00
cc8d8da0fe
Merge pull request #11531 from Ghommie/Ghommie-cit630
...
Removing some egg-celent unused preferences.
2020-03-20 22:56:19 -07:00
kevinz000