Commit Graph

344 Commits

Author SHA1 Message Date
Fermi 02de745519 Merge branch 'Wheelchairs' of https://github.com/Thalpy/Citadel-Station-13 into Wheelchairs 2019-06-17 12:02:56 +01:00
Fermi 2681a8f7a9 Updates has_trait to HAS_TRAIT 2019-06-17 12:02:39 +01:00
Thalpy 98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
SkullyRoberts e83365daed Added a penis autosurgeon as rare maint loot 2019-06-08 17:12:51 -04:00
kevinz000 ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa 27ef3ce281 Without this, everyone is broken 2019-06-05 08:10:20 -05:00
Poojawa a2b4f4261c Fixes missing hands and marking overlap
cleans up the code a bit too. Improves female chest sprites.
2019-06-05 02:33:25 -05:00
Poojawa b053fe3c86 Probably fixes synth hand issues 2019-06-04 23:36:58 -05:00
kevinz000 fc1611d86a Merge pull request #8426 from Sishen1542/sloom-hnngh
Slimespeak!
2019-06-03 00:51:36 -07:00
Fermi 7990a20ea6 We don't have wheelchairs? Heresy. Plus fixes to work on citcode. Csafe 2019-06-01 17:20:04 +01:00
Fermi 44d13818f0 Inital paralysis. (https://github.com/tgstation/tgstation/pull/41140) 2019-06-01 16:52:58 +01:00
deathride58 4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
Sishen d082479ccb Slimespeak! 2019-05-24 08:48:03 -04:00
Poojawa ae939c4344 Female Gendered markings 2019-05-21 22:51:00 -05:00
kevinz000 999bb87b4a Merge pull request #8378 from Useroth/nutcracker
Nutcracker. Yes, it's big enough to crush heads.
2019-05-20 23:35:33 -07:00
Useroth 2ec5bc2db6 Because Travis is being a bitch right now. 2019-05-19 21:29:09 +02:00
Useroth a92abcbb96 It's always the more extreme stuff you don't notice. Moved the damage check AFTER the check whether the head exists to begin with. 2019-05-18 21:40:43 +02:00
Useroth d2f7b961d9 Touch-up 2019-05-17 17:16:43 +02:00
Useroth 0f54bf7471 Might as well format it a little more. 2019-05-17 17:09:10 +02:00
Useroth 73c3e94946 A fixed oopsie. 2019-05-17 17:07:45 +02:00
Useroth 4d75eca582 Well, that was surely an interesting thing to code. 2019-05-17 16:22:17 +02:00
Poojawa f95da1aae5 Heart Attacks will murder you now
Also sanity check for cursed heart overlay
2019-05-17 05:59:28 -05:00
Useroth 06681790cd ... 2019-05-17 04:24:38 +02:00
Poojawa 28eb23d474 Fixes prosthetics and missing markings 2019-05-09 16:15:03 -05:00
Poojawa 72751a9efc Sorts and cleans up some sprites
adds guilmon things to lizards as well, since they didn't have it I guess
2019-04-29 04:33:23 -05:00
deathride58 41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58 2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58 8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
Poojawa 294349125e fixes floaty-leg syndrome for xenos
also fixes random gen colors from bugging out, idk why it was working just fine before but whatever
2019-04-06 16:32:29 -05:00
deathride58 6259210a33 Merge pull request #8198 from Poojawa/Randomize-tweaks
Species Spawn tweaks and tauric plasmaman suit icons
2019-04-05 20:11:59 -04:00
Poojawa ebc9c6d8f0 attempts to make slime sprites equally transparent
also gives them snouts and markings for improvments
2019-04-04 22:01:52 -05:00
kevinz000 63dd18c790 Merge pull request #8180 from Trilbyspaceclone/Weebo
adds toy katana and lum eyes to load out - Requested by MrJWhite
2019-04-02 05:35:31 -07:00
deathride58 a8f67cfc8a Merge pull request #8134 from Ragolution/BadWording
Amends and corrects some meh wording on the operating console.
2019-03-31 21:32:10 -04:00
Trilbyspaceclone 1dc121e407 Update autosurgeon.dm 2019-03-28 21:33:21 -04:00
Ragolution e00c196824 CALL IT A MEME PR ONE MORE TIME AND SEE WHAT HAPPENS
bottom text
2019-03-21 19:07:22 -04:00
Poojawa fbc2b15d21 Make sure the oxygen max doesn't do fucky things 2019-03-21 15:13:11 -05:00
Poojawa 0ffa3f6670 carbon Oxygen toxicity 2019-03-21 15:05:58 -05:00
Ragolution 7b26e7038a Merge branch 'master' into BadWording 2019-03-18 16:30:01 -04:00
Ragolution 9cb4265675 Improves operation console stuff
Changes confusing wording on Optable console
2019-03-18 16:22:18 -04:00
Ragolution 67f25f2721 Additional methods.
Requested by nicc
2019-03-14 18:02:29 -04:00
Ragolution 12db99dc01 Update revival.dm
Adds Abductor Science Tool to acceptable implements to revive a dead body.
2019-03-14 13:21:04 -04:00
kevinz000 317dc309a0 Merge pull request #8024 from deathride58/bloodybloodbloodblood
Atomizes the med rework's blood effect changes (most things that make a blood effect will now make you actually lose blood) and makes the blood reagent act more like you'd expect
2019-02-27 16:03:56 -08:00
deathride58 eac9c85c91 fixes body_markings being assigned as a list when in reality its a string (#8047) 2019-02-26 15:27:46 -08:00
Poojawa b393789f19 Character Creation Overhaul (#7987)
* Rebase fail. good thing I made back ups. c:

* Tails more or less done

* wouldn't update cleanly otherwise

* It's completly working now. holy fuck I did it

Just need the refurbished body markings done, then to chop 'em up for full PR status

* MARKINGS DONE AAAAAAAAAAAAA

* fixes digi legs that didn't convert correctly

* ports the refractored preferences

Kinda ugly now tbh. but fuckit

* quality sweep, things should should properly now in general

* Taurs converted and improved! BODYMARKING -> MATRIXED

* oops. s'what I get for not compile checking

* remember to throw shade at furries

* vigorously update markings upon switching species and colors

* re-adds old wolf ears, Big Wolf fixes snout bugs

* few more snout tweaks

* cut the lists, cut everything. reeee

* This code I s2g

* Adds context clues to preferences

Hopefully people will read them before making an OOC fuss

* Fixes hands and feet markings with this one weird trick

remember kids, proper layering and order of operations is important

* Sprite tweaking and polishing

Sergal stuff being worked on

* a few QoL things for species swapping

* how the fuck did I miss these markings

* fleshes out sprites in preperation for marking experimentation later

* fixes catboy problems

* Mam_snout is a thing now,

* pixel adjusted tails, cleaned up wah tail a bit better

also gets digitgate legs missing pixels fixed

* cleans up more shit. ree

* force "plain" instead of none to avoid missing pixel reports

* tweaks to reinspire mapdiff

* Clean up Preference UI

Looks a little better now

* k

* doubly ensure None markings aren't valid

* reee spessman barbie

* brightens pixels around tiger head markings

* YEENS

* Cat ears tweaked because it triggers Kev otherwise

* another session of quality control

* Crows and crow accessories

* husk fixes

* works good enough, mission accomplished

* fixes the proc properly

* cleans up brute force code that isn't needed

* c a t
2019-02-22 05:59:05 -08:00
deathride58 20740bda39 a bloody fun time - atomizes the med rework's blood effect changes and makes the blood reagent act more like you'd expect 2019-02-20 00:38:23 -05:00
Zargul 4574627250 Low plasma concentration does not damage anymore (#7977)
* Update lungs.dm

* Update lungs.dm

* Update lungs.dm
2019-02-08 02:11:02 -08:00
Ghom 0449325212 Fixes invisible limb sprites. (#7951)
* F

* FF

* FFF
2019-02-05 18:05:34 -08:00
kiwedespars a876e985e7 adds bwoink and snap to vog
this isn't needed
adds heyo to orgasm words too.

however, man once thought of something really stupid, and man's contributor didn't want to do it, so man made it happen
2019-01-24 18:41:42 -08:00