Commit Graph

207 Commits

Author SHA1 Message Date
Timothy Teakettle
c1932be528 last second edit woops 2020-07-25 21:53:11 +01:00
Timothy Teakettle
8b2a92994f less rng reliance 2020-07-25 20:14:41 +01:00
Timothy Teakettle
3a894f79d0 less rng reliant this is way better 2020-07-25 19:56:46 +01:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
timothyteakettle
0ccbe0b793 it works 2020-07-22 14:49:22 +01:00
Timothy Teakettle
fdfee756b7 you can enter stamcrit now 2020-07-19 18:18:22 +01:00
timothyteakettle
74b2764591 sprites and some missed things 2020-07-18 03:08:03 +01:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +01:00
Ghommie
6e90560173 Nerfs natural stamina recovery outside of stam-crit. 2020-06-28 02:40:16 +02:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Timothy Teakettle
95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Ghom
d7954ca077 Yet another PR fixing some issues. (#12424) 2020-06-02 15:29:01 -07:00
Arturlang
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
Ghommie
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
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Lin
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
Ghommie
592198d659 Makes privates not spew around upon disembowelment or gibbing. 2020-05-02 20:01:54 +02:00
Ghommie
a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +02:00
Ghom
858c697acc Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
Xenomorph balancing pass
2020-04-26 14:03:15 +02:00
kevinz000
b29c211772 Update bodyparts.dm 2020-04-22 18:44:59 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
kevinz000
0eac988f52 okay! 2020-04-22 08:22:52 -07:00
Ghommie
d84ef22f22 I'm amazed this actually works fine. 2020-04-14 21:58:37 +02:00
Ghommie
571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
necromanceranne
b57ce2d7ff missed this with my last pr (#11619) 2020-03-26 01:01:34 +01:00
kevinz000
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
necromanceranne
2b66eadc5e OW MY LIMBS HURT MORE FROM STAMINA DAMAGE 2020-03-25 09:54:46 +11:00
Ghommie
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
Ghommie
76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Ghommie
26e2ec92ca Removes species default_features variable. 2020-03-21 02:04:57 +01:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
Ghommie
4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghom
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
deathride58
ee65f070bf fixes runtime with body markings 2020-03-05 23:22:56 -05:00
deathride58
c5109fa31a addresses review 2020-03-04 21:04:34 -05:00
deathride58
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
deathride58
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
Seris02
84d08fe122 firebreath change + update to tg genetics + calc patch 2020-02-22 19:42:33 +08:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Seris02
2d9c8ce8fc fixing merge conflicts 2020-02-15 15:41:52 +08:00
Winter Flare
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
Seris02
ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
kevinz000
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
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00