Poojawa
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
deathride58
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07: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
MoreRobustThanYou
9c957f5a0b
Heart Disease 2: Electric Boogaloo ( #35296 )
...
* Heart Disease 2: Electric Boogaloo
* Upd8
2018-02-08 03:02:29 -06:00
MoreRobustThanYou
2f8d49de91
[READY] Monkey mode overhaul
2017-12-15 18:35:52 -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
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
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
