cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 16:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
d98eb14a3950683f6ddb0fed9674396faf900d8a
Paradise/code/game/objects/items/weapons
T
History
Mark van Alphen d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
2019-05-04 03:16:38 +02:00
..
grenades
Remaps Toxins
2019-04-11 07:24:16 -04:00
implants
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
melee
Lavaland code review fixes - also integrates flyswatter and cat toy
2019-04-20 00:24:58 +02:00
storage
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-04 03:16:38 +02:00
tanks
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
AI_modules.dm
…
alien_specific.dm
…
bee_briefcase.dm
…
cards_ids.dm
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-30 19:26:17 +02:00
cash.dm
…
caution.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
chrono_eraser.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
cigs.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
clown_items.dm
…
cosmetics.dm
…
courtroom.dm
Suicide Refactor
2019-03-27 22:54:26 -04:00
defib.dm
Merge pull request #11151 from Fox-McCloud/suicide-refactor
2019-03-29 20:49:18 +08:00
dice.dm
Dice will now roll when thrown
2019-04-19 22:48:15 +02:00
disks.dm
…
dna_injector.dm
COMIC injector fix
2019-05-01 21:07:43 +02:00
dnascrambler.dm
…
explosives.dm
Suicide Refactor
2019-03-27 22:54:26 -04:00
extinguisher.dm
…
fireworks.dm
…
flamethrower.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
garrote.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
gift_wrappaper.dm
…
handcuffs.dm
alternative. 1 handed cuffing
2019-03-25 20:19:42 +01:00
highlander_swords.dm
…
holosign.dm
…
holy_weapons.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
kitchen.dm
Lavaland code review fixes - also integrates flyswatter and cat toy
2019-04-20 00:24:58 +02:00
legcuffs.dm
Code review fixes
2019-04-24 16:29:22 +02:00
lighters.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
manuals.dm
…
misc.dm
…
mop.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
paint.dm
…
paiwire.dm
…
pneumaticCannon.dm
…
powerfist.dm
…
RCD.dm
Lavaland baseturf implementation
2019-03-31 22:07:30 +02:00
RCL.dm
…
rpd.dm
…
RSF.dm
…
scissors.dm
…
scrolls.dm
Adds cancel button to teleportation scrolls
2019-04-19 15:59:03 +02:00
shards.dm
Suicide Refactor
2019-03-27 22:54:26 -04:00
shields.dm
…
signs.dm
…
soap.dm
…
staff.dm
…
stock_parts.dm
…
stunbaton.dm
Merge remote-tracking branch 'upstream/master' into fix-cqc
2019-04-07 19:54:14 -04:00
swords_axes_etc.dm
…
tape.dm
…
teleportation.dm
…
teleprod.dm
…
tools.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
twohanded.dm
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-26 23:07:57 +02:00
vending_items.dm
…
weaponry.dm
Suicide Refactor
2019-03-27 22:54:26 -04:00
whetstone.dm
Remove infinite claw sharpening
2019-04-15 00:01:08 +02:00