cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-14 03:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
aec7bcc64d228287db5317f89b1ea3327a2c19be
Paradise/code/game/objects/items/weapons
History
Mark van Alphen 09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
2019-04-18 03:15:52 +02:00
..
grenades
Remaps Toxins
2019-04-11 07:24:16 -04:00
implants
Replaces uplink management by automated sharing
2019-01-03 16:29:31 +00:00
melee
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-10 21:54:54 +02:00
storage
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-18 03:15:52 +02:00
tanks
Made tanks empty, remove unnecessary tank types and added toxins tech requirement to AEG and welding gas mask
2018-12-12 23:31:43 +00:00
AI_modules.dm
remove commented out old quarantine module
2018-11-08 11:22:53 +01:00
alien_specific.dm
…
bee_briefcase.dm
Fixes negative bees
2019-01-20 14:41:45 +00:00
cards_ids.dm
Added Syndicate base and ported over turf decals
2019-03-31 20:26:02 +02:00
cash.dm
…
caution.dm
Clears up some relative pathing part 1
2018-10-10 23:39:34 +08:00
chrono_eraser.dm
…
cigs.dm
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -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
[Goonchem] Pills, Bottles, Patches, and Pillbottles
2019-03-17 21:30:10 -04:00
disks.dm
…
dna_injector.dm
Fixes Genetic Powers Activation
2019-03-02 19:33:53 -05:00
dnascrambler.dm
Clears up some relative pathing part 1
2018-10-10 23:39:34 +08:00
explosives.dm
Suicide Refactor
2019-03-27 22:54:26 -04:00
extinguisher.dm
Formatting fixes & spanning fish tank
2018-10-13 22:12:37 +08:00
fireworks.dm
Refactors Spark Spread Activation
2018-10-17 14:31:07 -04:00
flamethrower.dm
…
garrote.dm
Suicide Refactor
2019-03-27 22:54:26 -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
Suicide Refactor
2019-03-27 22:54:26 -04:00
kitchen.dm
Port over Corn and affected's work on Lavaland
2019-04-01 23:41:32 +02:00
legcuffs.dm
Suicide Refactor
2019-03-27 22:54:26 -04:00
lighters.dm
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
manuals.dm
remove throwforce on space law
2019-01-23 14:23:21 +00:00
misc.dm
Clears up some relative pathing part 1
2018-10-10 23:39:34 +08:00
mop.dm
…
paint.dm
TG container_type refactor
2018-10-13 08:20:52 +08:00
paiwire.dm
…
pneumaticCannon.dm
…
powerfist.dm
…
RCD.dm
Lavaland baseturf implementation
2019-03-31 22:07:30 +02: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
…
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
Suicide Refactor
2019-03-27 22:54:26 -04:00
twohanded.dm
Port over Corn and affected's work on Lavaland
2019-04-01 23:41:32 +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