Commit Graph

74 Commits

Author SHA1 Message Date
Ghommie 8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Ghommie 53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
nik707 e4a41c6169 Merge pull request #9932 from Putnam3145/fix-genital-contam
Make organs no longer radiaoctively contaminable.
2019-12-06 20:37:53 -06:00
Putnam3145 44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
2019-11-30 22:22:52 -08:00
Putnam 6c51f09a82 Make organs no longer contaminable. 2019-11-23 21:14:24 -08:00
Fermi 399986f3f7 Forgot to update the procs 2019-11-22 23:57:09 +00:00
Thalpy 0cce3a01f4 Ghommie's requiem 2019-11-21 19:39:55 +00:00
Thalpy bd07ff4bf7 This should be the one! 2019-11-21 18:55:43 +00:00
Thalpy 00bffba7ea Why do surgeries always end up with jank 2019-11-21 15:57:21 +00:00
Thalpy 46076c95c7 Ghommie is a good friend 2019-11-21 14:22:04 +00:00
Fermi b911fabb37 Okay bedtime 2019-11-21 04:25:25 +00:00
Fermi 18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00
Fermi cc53a0061f Well it compiles 2019-11-21 02:15:58 +00:00
Ghommie 358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
Ghommie 97dd0bd70c Yes. 2019-11-05 23:13:10 +01:00
Ghommie 475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-17 00:50:30 +02:00
Thalpy 4b069afb42 Scrub a dub dub 2019-10-15 08:42:40 +01:00
Thalpy 91762d7c65 Cleanup 2019-10-15 08:22:53 +01:00
Fermi a80b5c8a84 Autosurgies 2019-10-14 13:39:39 +01:00
Fermi 8ddd5402fe Mobcheck 2019-10-14 13:35:42 +01:00
Fermi 7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Thalpy 8a5562e92e Ghmoneie 2019-10-13 23:56:18 +01:00
Thalpy 924fa50659 Update code/modules/surgery/organs/organ_internal.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-10-13 23:55:42 +01:00
Thalpy 094221f4ae IndenettSADgsdfafhfdnfzbdf 2019-10-13 23:52:34 +01:00
Thalpy 7973347bf3 indent 2019-10-13 23:50:25 +01:00
Thalpy 1621c4c7d4 stupid bitflags 2019-10-13 23:50:08 +01:00
Fermi 50ef6aa257 Eye fix 2019-09-27 13:28:23 +01:00
Fermi 888906b4e7 Fixes Mk1 ! 2019-09-27 11:12:53 +01:00
Fermi a3ae942c1d Okay.. I think this fixes it all. 2019-09-21 11:13:20 +01:00
Fermi a08c1229d6 OKAY now I'm done I think. 2019-09-21 09:31:53 +01:00
Fermi 107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
Fermi dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. 2019-09-18 23:57:21 +01:00
Ghommie 2a7b802957 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-08-29 21:01:23 +02:00
Fermi 18b03f9053 Furranium fixes. 2019-08-01 03:38:06 +01:00
Ghommie 376f6e8b4a arousal states won't persist after death anymore. 2019-07-23 23:54:11 +02:00
Thalpy a2a5bbdb11 Found the "the floor" message admin! 2019-06-26 19:40:46 +01:00
Fermi 6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi b4beb006f9 More fixes. 2019-06-14 15:43:48 +01:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02: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
CitadelStationBot 6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710)
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
2018-03-05 12:34:01 -06:00
MoreRobustThanYou 9c957f5a0b Heart Disease 2: Electric Boogaloo (#35296)
* Heart Disease 2: Electric Boogaloo

* Upd8
2018-02-08 03:02:29 -06:00
vuonojenmustaturska 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
CitadelStationBot cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
ACCount eb54055278 Refactor of catpeople mutant organs 2017-11-01 21:38:06 -05:00
LetterJay 0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
ACCount 1c1f39d1d3 Fixes a runtime on organ replacement 2017-10-25 23:38:31 -05:00
Jordan Brown f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
Jordan Brown 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
AnturK fd5acc5573 Organ initialization cleanup 2017-10-03 14:18:39 -05:00