madmanmartian 0f66b1995c Merge remote-tracking branch 'pomfrepo/Bleeding-Edge' into role_datums_rebasaroo ...

# Conflicts:
#	code/modules/mob/living/living.dm
#	icons/obj/items.dmi
#	icons/obj/stationobjs.dmi

2018-09-25 10:36:47 +01:00

..

changeling_powers.dm

Role datums RoleTopic unfuck (#19731)

2018-09-25 09:22:18 +01:00

changeling.dm

Trader 2 (#19608)

2018-09-12 13:33:04 -04:00

horror.dm

Bleeding-edge into role_datums, episode 3: revenge of git merge (#18712)

2018-07-03 04:28:11 -07:00

modularchangling.dm

Removes obscure changeling vore (#19764)

2018-09-23 20:11:55 +01:00

traitor_chan.dm

…