d7954ca077
Yet another PR fixing some issues. ( #12424 )
2020-06-02 15:29:01 -07:00
32135cc008
Makes bloodsuckers unguttable and undecappable ( #12335 )
...
* Bloodsuckers cant be gutted or beheaded anymore
* Mistakes were made
2020-05-24 13:08:18 -07:00
f770586407
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723
2020-05-05 05:09:29 +02:00
643ef48f0e
Macros, generic skill implementations.
2020-05-05 04:42:34 +02:00
793cbd6cbd
Merge pull request #12094 from Ghommie/Ghommie-cit719
...
Makes privates not drop upon disembowelment or gibbing.
2020-05-03 21:24:44 +00:00
592198d659
Makes privates not spew around upon disembowelment or gibbing.
2020-05-02 20:01:54 +02:00
a1f252d558
Fixing several reported issues.
2020-05-01 19:48:27 +02:00
858c697acc
Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
...
Xenomorph balancing pass
2020-04-26 14:03:15 +02:00
b29c211772
Update bodyparts.dm
2020-04-22 18:44:59 -07:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
0eac988f52
okay!
2020-04-22 08:22:52 -07:00
d84ef22f22
I'm amazed this actually works fine.
2020-04-14 21:58:37 +02:00
571584901c
Custom skin tone preferences.
2020-04-14 19:10:28 +02:00
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
b57ce2d7ff
missed this with my last pr ( #11619 )
2020-03-26 01:01:34 +01:00
4d43f2bdf9
Merge pull request #11605 from necromanceranne/ONLY_TRUST_YOUR_FISTS
...
PUNCHING: YOU SHOULD BE SCREAMING EDITION
2020-03-25 12:23:08 -07:00
2b66eadc5e
OW MY LIMBS HURT MORE FROM STAMINA DAMAGE
2020-03-25 09:54:46 +11:00
d336bcf259
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit632
2020-03-23 21:02:47 +01:00
76ff0d4931
M/F body preferences.
2020-03-22 19:47:48 +01:00
26e2ec92ca
Removes species default_features variable.
2020-03-21 02:04:57 +01:00
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
4143c1963c
Porting more legcuffs / bola fixes etcetera
2020-03-09 16:20:51 +01:00
cccd0e9eef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-03-09 16:49:32 +08:00
8878733fc1
Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
...
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
ee65f070bf
fixes runtime with body markings
2020-03-05 23:22:56 -05:00
c5109fa31a
addresses review
2020-03-04 21:04:34 -05:00
560192c45a
Does the thing - PORTS THE BEEPERS! also fixes a bug where body markings dont render if their name doesnt match the iconstate
2020-03-03 15:49:25 -05:00
9efdad1d6b
Initial commit - lays out the foundation for a more robust limb icon override system. You're welcome.
2020-03-03 13:55:33 -05:00
84d08fe122
firebreath change + update to tg genetics + calc patch
2020-02-22 19:42:33 +08:00
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
2d9c8ce8fc
fixing merge conflicts
2020-02-15 15:41:52 +08:00
bb641fecf8
Sprites, Tweaks, and Snacks
...
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.
Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
2020-02-09 23:07:32 -05:00
ee7064840d
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
275b1f73e0
Merge pull request #10849 from Ghommie/Ghommie-cit547
...
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
8de11845d5
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-02 03:39:49 +01:00
9827b15466
Unused variables wasting my memory
2020-01-24 23:05:59 -07:00
d86af199f5
initialize
2020-01-24 21:22:59 -07:00
78b901f66f
spacing is a pet peeve
2020-01-24 21:18:51 -07:00
9761d68f4b
more merge conflict fixes
2020-01-24 10:14:31 +08:00
89e204b980
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 23:12:17 -07:00
593e626233
Merge pull request #10346 from deathride58/limbstamlossnerf
...
Nerfs limb stamcrit by doubling the base limb stam regen rate and making disabled limbs double the regen rate further
2020-01-19 23:11:02 -07:00
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
b341818f04
mobility flags
2020-01-12 11:00:12 -08:00
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
ac4489c6a8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-11 13:55:29 +08:00
830054c106
sigh
2020-01-10 13:25:47 -08:00
c4cb06f8f0
Merge pull request #10112 from Ghommie/Ghommie-cit447
...
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
dd6e85ddac
Merge pull request #10483 from Putnam3145/fix_limbs
...
Fix limb damage
2020-01-09 03:04:44 +01:00
Ghom