Commit Graph

27 Commits

Author SHA1 Message Date
Artur 02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
Poojawa 088bc484e3 Forensics re-destroyed, but better this time.
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
Poojawa 0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa 3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa 971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
kevinz000 ed4c9506a7 Merge pull request #8388 from Useroth/collars-n-shit
Quick fix for the colorable collars. I've made the mistake of not testing code after applying a suggestion.
2019-05-18 08:30:10 -07:00
Useroth 8ea639a5ac Quick fix for the colorable collars. 2019-05-18 15:26:46 +02:00
deathride58 d855a7eb0d Merge pull request #8332 from Useroth/collars-n-shit
Two new collar types (with lockable variants). All collars are now colorable a'la polychromic stuff.
2019-05-17 00:10:41 -04:00
Useroth 701b01dfa6 Just another commit to make travis fucking recompile it 2019-05-15 02:30:47 +02:00
Useroth 8500e69088 Merge branch 'collars-n-shit' of github.com:Useroth/Citadel-Station-13 into collars-n-shit 2019-05-15 02:09:41 +02:00
Useroth 3f64128513 Apply suggestions from code review
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-05-15 02:08:43 +02:00
Useroth 6a29a0744b Applied suggested changes. 2019-05-15 02:07:16 +02:00
Useroth f910eea9f8 Update code/modules/clothing/neck/_neck.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-05-15 01:41:18 +02:00
Useroth 4355584833 Added them to loadout too. 2019-05-09 12:09:18 +02:00
Useroth abe8ed16cb A small touch-up. 2019-05-09 11:38:33 +02:00
Useroth 1efd7123f2 Two new collar types. All collars are now colorable a'la polychromic stuff. 2019-05-09 11:22:51 +02:00
Trilbyspaceclone 0aa78684a5 I guess cookies unlock collars are not intended 2019-05-01 18:36:54 -04:00
Trilbyspaceclone fcda4c0fbb Update _neck.dm 2019-04-25 20:40:48 -04:00
Jordan Brown 1ee84bb7d2 Merge pull request #38580 from Hyacinth-OR/pinkscarf
Adds a pink scarf
2018-06-19 09:49:28 -05:00
oranges 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
CitadelStationBot 3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
MrDoomBringer 4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
oranges 269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
Ashe Higgs 7b3c2862d3 Stethoscope defibrillation checking (#33234) 2017-12-05 03:22:48 -06:00
LetterJay 79d6f42dfd conflicts 2017-10-28 01:16:26 -05:00