Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi

2017-01-20 23:43:35 +01:00

..

organs

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-20 23:43:35 +01:00

bones.dm

Don't worry, bones grow back (You can now mend incisions after

2016-08-21 13:13:56 -07:00

dental_implant.dm

Action Button Update

2016-07-18 13:23:01 -07:00

encased.dm

Merge pull request #5512 from Crazylemon64/dont_worry_bones_grow_back

2016-08-22 19:33:11 -04:00

face.dm

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

generic.dm

add_logs() un-fuckery

2016-08-29 17:27:56 -04:00

helpers.dm

Makes IPC surgery much more reliable, object insertion surgery

2016-08-14 18:12:23 -07:00

implant.dm

Forgot about this one, too

2016-08-21 13:26:31 -07:00

limb_reattach.dm

Conflict resolution again

2016-08-19 01:08:08 -04:00

organs_internal.dm

Fix xenomorph organ surgery (properly)

2016-12-21 07:16:13 -08:00

other.dm

Abductor surgery, Face repair, now all work again

2016-08-22 11:42:01 -07:00

robotics.dm

add_logs() un-fuckery

2016-08-29 17:27:56 -04:00

slime.dm

…

surgery.dm

Removes debugging code

2016-08-14 18:27:04 -07:00

tools.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00