cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
f63a9c279ccea1b690df062d041e8fac8b34fcbf
Paradise/code/game/objects/items
History
Markolie f63a9c279c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/defines/procs/announce.dm
#	code/modules/events/mass_hallucination.dm
2016-10-31 14:46:58 +01:00
..
devices
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-10-31 14:46:58 +01:00
mountable_frames
Fix light fixture frame progress bar
2016-10-15 12:47:38 +02:00
robot
Topic UID finishing touches
2016-09-08 13:07:14 -04:00
stacks
Merge pull request #5642 from Krausus/UniqueIDs
2016-09-12 15:32:20 -04:00
weapons
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
2016-10-30 22:40:24 -04:00
ashtray.dm
Mass replace
2016-07-07 19:34:02 -07:00
blueprints.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
bodybag.dm
Merge branch 'master' into w_class
2016-07-10 09:29:12 -04:00
candle.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
changestone.dm
Mass replace
2016-07-07 19:34:02 -07:00
contraband.dm
…
control_wand.dm
Better Destroys
2016-08-02 23:59:23 -04:00
crayons.dm
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
dehy_carp.dm
…
documents.dm
Removes .0 at the end of w_class numbers
2016-07-08 12:26:34 -04:00
flag.dm
Fixes the flag sometimes not deleting right away.
2016-08-11 12:02:03 -07:00
latexballoon.dm
Better Destroys
2016-08-02 23:59:23 -04:00
misc.dm
Removes .0 at the end of w_class numbers
2016-07-08 12:26:34 -04:00
policetape.dm
Merge branch 'master' into w_class
2016-07-10 09:29:12 -04:00
random_items.dm
…
shooting_range.dm
Mass replace
2016-07-07 19:34:02 -07:00
toys.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
trash.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00