deathride58 936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

..

species_types

Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858

2018-03-09 18:37:29 +00:00

damage_procs.dm

Changes some 1s and 0s to TRUE and FALSE (#1967)

2017-07-10 16:13:16 -07:00

death.dm

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

dummy.dm

Dedicated equipment removal proc (#31411)

2017-10-08 13:18:12 -05:00

emote.dm

dogborg tweaks, so fuggin DUMB (#5202)

2018-01-30 15:17:46 -06:00

examine_vr.dm

Vore code to json and more (#5789)

2018-03-06 03:59:31 -06:00

examine.dm

Vore code to json and more (#5789)

2018-03-06 03:59:31 -06:00

human_defense.dm

[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]

2018-03-07 20:49:25 -06:00

human_defines.dm

[MIRROR] Disease antagonist (#5815)

2018-03-05 15:20:59 -06:00

human_helpers.dm

[MIRROR] Converts several species traits into generic traits (#5710)

2018-03-05 12:34:01 -06:00

human_movement.dm

living carbon

2018-01-04 01:36:28 -05:00

human.dm

[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]

2018-03-07 20:49:25 -06:00

inventory.dm

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

life.dm

[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]

2018-03-07 20:49:25 -06:00

login.dm

…

physiology.dm

[MIRROR] Extensive surgery additions (#5590)

2018-02-19 10:48:11 -06:00

say.dm

[MIRROR] Disease antagonist (#5815)

2018-03-05 15:20:59 -06:00

species.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

status_procs.dm

Adds minor roundstart traits! (ala CDDA, etc.)

2018-03-02 14:38:18 -06:00

update_icons.dm

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

whisper.dm

…