Ghom
eb48e00bcb
Merge pull request #11805 from kevinz000/damage_procs_lite
...
/carbon adjustStaminaLoss is now armor-piercing *as intended* before our modularized bandaid
2020-04-16 19:05:34 +02:00
Ghommie
fe43581d31
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
2020-04-16 15:09:52 +02:00
Anonymous
9d6f013bde
Makes Xenohybrids scream Xeno
...
Because if they can hiss like xeno, why not screem like one?
2020-04-16 14:23:16 +03:00
Ghommie
7193efa613
Fixing some doggie issues.
2020-04-16 05:29:17 +02:00
kevinz000
b69c0944c9
Update human.dm
2020-04-14 21:54:23 -07:00
Ghommie
571584901c
Custom skin tone preferences.
2020-04-14 19:10:28 +02:00
Ghom
5d01e05991
Merge pull request #11618 from Arturlang/Garlic
...
Adds garlic, and tweaks bloodsuckers a bunch.
2020-04-14 12:38:34 +02:00
kevinz000
f460d0dab0
Merge pull request #11831 from Ghommie/Ghommie-cit677
...
Fixing some sprite accessories offsets, shifted the icon states 2 px down.
2020-04-14 01:33:57 -07:00
Artur
f910a0fd32
Conflict fixes
2020-04-14 09:27:54 +03:00
Ghommie
616d482cf6
Deleting poly clothes copypasta.
2020-04-13 22:51:46 +02:00
Ghommie
db43f53ac4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 16:15:40 +02:00
kevinz000
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
Ghommie
05a954f000
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 02:01:01 +02:00
kevinz000
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
Ghommie
2e2b9cfe1b
Fixing some sprite accessories offsets, shifted the icon states 2 px down.
2020-04-12 09:13:44 +02:00
kevinz000
4e99c6bb28
Update damage_procs.dm
2020-04-11 08:24:57 -07:00
spookydonut
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
Ghommie
af55880794
Fixes and standarizes a few liver troubles. Re-enables liver failure.
2020-04-10 17:22:34 +02:00
kevinz000
ca45514444
typos
2020-04-09 21:55:54 -07:00
kevinz000
3bfc62fbb9
dmg
2020-04-09 21:55:02 -07:00
Ghommie
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
Ghommie
d2b624a908
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
2020-04-09 14:59:40 +02:00
kevinz000
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
Lin
c2cbad81dd
what the fuck
2020-04-08 19:00:18 +00:00
Lin
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
TrilbySpaceClone
2cd59a6fb0
that was easy
2020-04-06 08:40:34 -04:00
Putnam3145
70cd562b36
Merge pull request #11720 from Trilbyspaceclone/patch-328
...
Corrects missing slash in a bullet
2020-04-04 01:02:32 -07:00
Ghommie
56669f9296
Minor snowflakes clothing variations refactor. Removal of copypasted states.
2020-04-04 00:22:18 +02:00
Ghommie
58bc10bd31
Fixing three runtime errors.
2020-04-02 23:33:40 +02:00
Ghommie
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
Trilbyspaceclone
3948214380
Update handguns.dm
2020-04-02 09:18:37 -04:00
Artur
a903752ff9
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-31 19:42:35 +03:00
Ghommie
e26b43d80b
The banishment of the floating disembodied phallus.
2020-03-31 02:40:28 +02:00
Ghommie
2bf6d888bd
Ports "Obliterates item_color: new washing machine functionality edition"
2020-03-30 18:31:26 +02:00
Ghommie
c3faf94d8f
WIP
2020-03-30 05:29:39 +02: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
Ghommie
3c42e9eefd
Moderately unoriginal PR title about runtime errors.
2020-03-26 23:22:51 +01:00
kevinz000
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
deathride58
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
Ghommie
ddf4d759bd
Now locally tested too and it works fine.
2020-03-25 17:25:23 +01:00
Ghommie
c05d2c1572
Making it actually work.
2020-03-25 17:08:09 +01:00
Ghommie
c6b4b5f686
lazy fix before I go to sleep.
2020-03-25 05:17:09 +01:00
Ghommie
c1e13a83fb
Boom.
2020-03-25 03:35:29 +01:00
Ghommie
c9f02d97a1
Privates Visibility Preferences. Also Undergarments having a purpose.
2020-03-25 02:47:16 +01:00
Ghommie
54cdae148d
Removes uncompiled flightsuit code leftovers and bad hooks.
2020-03-24 20:28:13 +01:00
Artur
c6a8515297
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-24 12:36:21 +02:00
kevinz000
bf0970d8c3
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-23 15:34:04 -07:00
kevinz000
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
Ghommie
76ff0d4931
M/F body preferences.
2020-03-22 19:47:48 +01:00
Ghommie
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
