8604297dcd
Merge pull request #11811 from Ghommie/Ghommie-cit671
...
Fixes and standarizes a few liver troubles. Re-enables liver failure.
2020-04-12 17:01:50 -07:00
d60932ca5d
Merge pull request #11697 from Ghommie/Ghommie-cit655
...
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
af55880794
Fixes and standarizes a few liver troubles. Re-enables liver failure.
2020-04-10 17:22:34 +02:00
7c1e5aa2c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-09 15:46:19 +02:00
22bf4cdb83
Merge pull request #11760 from Trilbyspaceclone/10mmchanges
...
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
2020-04-09 02:38:44 -07:00
c2cbad81dd
what the fuck
2020-04-08 19:00:18 +00:00
8379169b81
Merge pull request #11476 from kevinz000/shield_refactor
...
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
2cd59a6fb0
that was easy
2020-04-06 08:40:34 -04:00
70cd562b36
Merge pull request #11720 from Trilbyspaceclone/patch-328
...
Corrects missing slash in a bullet
2020-04-04 01:02:32 -07:00
58bc10bd31
Fixing three runtime errors.
2020-04-02 23:33:40 +02:00
45d1917f0f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-02 16:07:13 +02:00
3948214380
Update handguns.dm
2020-04-02 09:18:37 -04:00
e26b43d80b
The banishment of the floating disembodied phallus.
2020-03-31 02:40:28 +02:00
2bf6d888bd
Ports "Obliterates item_color: new washing machine functionality edition"
2020-03-30 18:31:26 +02:00
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
b5c4124d7a
Merge pull request #11638 from Ghommie/Ghommie-cit646
...
Moderately unoriginal PR title about runtime errors.
2020-03-27 17:12:49 -07:00
3c42e9eefd
Moderately unoriginal PR title about runtime errors.
2020-03-26 23:22:51 +01:00
b32e6c3b5b
Merge pull request #11607 from Ghommie/Ghommie-cit642
...
Adds privates visibility preferences. Also underwear now fulfills its purpose.
2020-03-26 13:24:26 -07:00
0bf2cf0484
Adds a lfwb-inspired orbiting pixel + flashing outline animation to the sprint and combat buttons (toggleable via prefs) ( #11623 )
...
* Adds a flashing effect to the sprint and combat mode toggles (toggleable via prefs)
* Adds the ability to change the color of the hud toggle flash as well
2020-03-26 16:51:48 +01:00
ddf4d759bd
Now locally tested too and it works fine.
2020-03-25 17:25:23 +01:00
c05d2c1572
Making it actually work.
2020-03-25 17:08:09 +01:00
c6b4b5f686
lazy fix before I go to sleep.
2020-03-25 05:17:09 +01:00
c1e13a83fb
Boom.
2020-03-25 03:35:29 +01:00
c9f02d97a1
Privates Visibility Preferences. Also Undergarments having a purpose.
2020-03-25 02:47:16 +01:00
54cdae148d
Removes uncompiled flightsuit code leftovers and bad hooks.
2020-03-24 20:28:13 +01: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
76ff0d4931
M/F body preferences.
2020-03-22 19:47:48 +01:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -07: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
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
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
32bfdb6712
Update cit_screenshake.dm ( #11554 )
2020-03-21 01:52:39 +01:00
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
7c22b341b9
Undefined var.
2020-03-19 17:38:41 +01:00
eca7eb2bcd
Nothing
2020-03-19 17:35:18 +01:00
eeab3ed11f
Everyday
2020-03-19 17:34:01 +01:00
da7a979842
Merge branch 'master' into Ghommie-cit629
2020-03-19 17:15:26 +01:00
dd7046cbd1
no comment
2020-03-19 16:53:58 +01:00
fb0925047a
mentor fixes and improvements ( #11519 )
...
* one teensy fix but imma go do something else quick
* yee?
* yee?
* yee 3
* ah shit
* uhhhhhh
* oh
2020-03-18 19:23:19 +01:00
c14b1c2857
linter
2020-03-16 14:18:47 -07:00
a77be038b8
refactoring this whole thing again
2020-03-16 04:56:32 -07:00
2113b63428
o boy
2020-03-14 21:42:23 -07:00
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
9f681e9a76
Merge pull request #11409 from necromanceranne/taser_nerf
...
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
2020-03-12 00:30:52 +01:00
46823a127b
Merge pull request #11335 from Ghommie/Ghommie-cit604
...
Made flavor texts into an element datum, appliable to every atom.
2020-03-10 17:26:20 -07:00
3d6c82cbc8
Merge pull request #11381 from Citadel-Station-13/Ghommie-patch-2
...
Something about layers.
2020-03-10 05:59:36 -07:00
kevinz000