cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 17:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
45a066c7d19597c6583a617ff781367bbc6ef821
Paradise/code/game/objects/items
History
Mark van Alphen 45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
2019-03-30 22:55:09 +01:00
..
devices
Merge pull request #11151 from Fox-McCloud/suicide-refactor
2019-03-29 20:49:18 +08:00
mountable_frames
Casing correction 1
2018-12-17 00:07:37 -05:00
robot
Gonna have to clean some files after this.
2019-01-19 22:38:47 -05:00
stacks
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-03-30 22:55:09 +01:00
weapons
Merge pull request #11151 from Fox-McCloud/suicide-refactor
2019-03-29 20:49:18 +08:00
ashtray.dm
…
blueprints.dm
asteroid claim improvements, golem ship security
2019-02-03 15:59:04 +00:00
bodybag.dm
…
candle.dm
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -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
…
control_wand.dm
…
crayons.dm
Suicide Refactor
2019-03-27 22:54:26 -04:00
dehy_carp.dm
…
documents.dm
Refactored pickup code and fixed the bug
2019-03-18 16:42:44 +01:00
flag.dm
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
latexballoon.dm
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
misc.dm
…
mixing_bowl.dm
…
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
Suicide Refactor
2019-03-27 22:54:26 -04:00
trash.dm
Updates files.
2019-01-27 00:56:01 -07:00