cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-15 20:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
fc243495b603565a360423fd4783d2a30ae06f4b
Paradise/code/game/objects/items/weapons
History
Mark van Alphen f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/__DEFINES/misc.dm
2019-05-04 03:07:36 +02:00
..
grenades
Remaps Toxins
2019-04-11 07:24:16 -04:00
implants
More lighting fixes
2019-05-04 03:06:10 +02:00
melee
Merge remote-tracking branch 'upstream/master' into fix-cqc
2019-04-07 19:54:14 -04:00
storage
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
2019-05-04 03:07:36 +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
Fixes negative bees
2019-01-20 14:41:45 +00:00
cards_ids.dm
upgrades ID computer
2019-04-23 21:02:27 -07: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
Casing correction 1
2018-12-17 00:07:37 -05:00
cosmetics.dm
Casing correction 1
2018-12-17 00:07:37 -05:00
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
Suicide Refactor
2019-03-27 22:54:26 -04: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
remove throwforce on space law
2019-01-23 14:23:21 +00:00
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
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE
2019-01-19 23:35:15 -05:00
RCL.dm
Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted
2018-12-01 00:13:21 +00:00
rpd.dm
fixes
2018-12-12 22:51:38 +00:00
RSF.dm
…
scissors.dm
Casing correction 1
2018-12-17 00:07:37 -05:00
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
Casing correction 1
2018-12-17 00:07:37 -05:00
stunbaton.dm
Merge remote-tracking branch 'upstream/master' into fix-cqc
2019-04-07 19:54:14 -04:00
swords_axes_etc.dm
Fixes and Updates CQC
2018-11-24 00:31:23 -05:00
tape.dm
Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted
2018-12-01 00:13:21 +00:00
teleportation.dm
…
teleprod.dm
…
tools.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
twohanded.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04: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