cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
2c5e216e82795ce6d8a0b33e856ccc4f1f36ff85
Paradise/code/game/objects/items
History
Mark van Alphen 2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
2019-05-17 17:37:18 +02:00
..
devices
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-13 22:14:38 +02:00
mountable_frames
Casing correction 1
2018-12-17 00:07:37 -05:00
robot
Merge
2019-05-09 17:06:35 +01:00
stacks
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-03 18:31:45 +02:00
weapons
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-17 17:37:18 +02:00
ashtray.dm
fixes
2019-04-24 00:49:23 -04:00
blueprints.dm
More lighting fixes
2019-05-04 03:06:10 +02:00
bodybag.dm
Forgot ERT, moved the boxes to boxes.dm
2018-11-10 12:08:06 +01:00
candle.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
cardboard_cutouts.dm
Gonna have to clean some files after this.
2019-01-19 22:38:47 -05:00
changestone.dm
…
contraband.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
control_wand.dm
Merge pull request #9986 from Dave-TH/access_tuner
2018-11-04 12:27:16 +08:00
crayons.dm
Suicide Refactor
2019-03-27 22:54:26 -04:00
dehy_carp.dm
Carp Expansion Pack
2019-04-29 23:47:25 +02:00
documents.dm
Added Syndicate base and ported over turf decals
2019-03-31 20:26:02 +02:00
flag.dm
It's Time
2019-04-14 18:24:48 -04:00
latexballoon.dm
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
misc.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
mixing_bowl.dm
Missed one
2018-07-01 03:55:15 -04:00
random_items.dm
fix merge conflict, wipe map changes
2019-01-03 14:39:41 -08:00
shooting_range.dm
Path normalization requires outdenting
2019-01-24 16:40:11 -06:00
toys.dm
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-03 18:31:45 +02:00
trash.dm
Updates files.
2019-01-27 00:56:01 -07:00