Commit Graph

14 Commits

Author SHA1 Message Date
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
Leo
1f83d3cbb7 Merge pull request #32071 from ShizCalev/heart-spam-fix
Fixes heartbeat message spam
2017-10-25 18:55:24 -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
Robustin
e9534fb156 Fix: No more beating sounds from dead hearts (#30871)
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Removes beating from nonbeating hearts

* single check
2017-09-20 10:58:55 -05:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
d2e771c9f3 Adds cybernetic organs (#2135) 2017-07-26 00:04:59 -07:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
3ee26917bd Organ Update [Cloning isn't broken edition] 2017-07-14 09:00:36 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
735b25c6e3 Merge branch 'master' into upstream-merge-28916 2017-06-30 10:36:11 -05:00
LetterJay
0390dce2e6 Update heart.dm 2017-06-30 10:35:24 -05:00
CitadelStationBot
98ff55f786 Adds heartbeats 2017-06-28 14:01:39 -05:00
CitadelStationBot
84321916a5 Refactors ears into organs (#513)
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
2017-04-26 09:52:35 -05:00