cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 13:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
2b767bb9c98dc71756349df80fbfc13be2152c1c
Paradise/code/game/objects/items/weapons
History
Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
2017-01-31 17:44:38 +01:00
..
grenades
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
2016-12-23 19:32:19 +01:00
implants
Polishes up the reset_view proc, which is basically
2016-12-21 17:56:57 -08:00
melee
Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.
2016-10-25 00:50:31 +02:00
storage
Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
2017-01-26 03:47:30 -08:00
tanks
Adds a ui_key arg to ui_data
2016-12-31 12:51:07 -08:00
AI_modules.dm
…
alien_specific.dm
Fully rips out cyborg sight modules
2017-01-10 00:32:11 -08:00
bee_briefcase.dm
Removes most hard-coded z level checks
2016-07-31 21:29:03 -07:00
cards_ids.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
cash.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
caution.dm
- 180 Reverse, Mines now banned from surplus
2016-12-20 10:09:38 +00:00
chrono_eraser.dm
Action Button Update
2016-07-18 13:23:01 -07:00
cigs.dm
Makes Reagents Holder Process and Refactors NOREACT
2017-01-14 20:09:49 -05:00
clown_items.dm
tweak
2016-07-26 04:50:22 -04:00
cosmetics.dm
…
courtroom.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
defib.dm
added it to defib, cloning, strange reagent
2017-01-12 19:44:18 +04:00
dice.dm
e20 get logged
2016-11-20 01:42:22 +01:00
disks.dm
…
dna_injector.dm
Switches over to the new system
2017-01-17 13:57:07 +01:00
dnascrambler.dm
Fixes DNA scrambler not having an icon
2016-09-11 23:44:27 -04:00
explosives.dm
…
extinguisher.dm
…
fireworks.dm
…
flamethrower.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
garrote.dm
Fixes a garrote runtime
2017-01-10 18:28:40 -08:00
gift_wrappaper.dm
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -08:00
handcuffs.dm
Added Legion megafauna, updated weather and some minor other refactors/changes.
2016-10-24 02:16:45 +02:00
holosign.dm
Janitorial Quality of Life Update (#5239)
2016-08-17 17:23:19 -04:00
holy_weapons.dm
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
2017-01-27 17:28:14 +01:00
kitchen.dm
…
legcuffs.dm
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-08-16 02:23:20 -04:00
lighters.dm
…
manuals.dm
…
misc.dm
Update misc.dm
2016-09-04 15:05:14 -05:00
mop.dm
Janitorial Quality of Life Update (#5239)
2016-08-17 17:23:19 -04:00
paint.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
paiwire.dm
…
pneumaticCannon.dm
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
power_cells.dm
…
powerfist.dm
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
RCD.dm
matter_is_neither_created_nor_destroyed
2017-01-16 00:54:56 -06:00
RSF.dm
…
scissors.dm
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
scrolls.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
shards.dm
Makes boldnotice and danger classes be be used
2016-08-11 12:20:02 -04:00
shields.dm
Makes shields counter xeno leap more effectively
2016-09-01 11:34:00 -04:00
signs.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
soap.dm
…
staff.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
stock_parts.dm
…
stunbaton.dm
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
swords_axes_etc.dm
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
syndie_uplink.dm
…
table_rack_parts.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
tape.dm
…
teleportation.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
teleprod.dm
derp
2016-07-26 13:23:58 -04:00
tools.dm
Delays and Welder Repair Tweaks
2016-08-19 21:34:39 -04:00
twohanded.dm
Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.
2016-10-25 00:50:31 +02:00
vending_items.dm
…
weaponry.dm
…
whetstone.dm
…
wires.dm
Makes boldnotice and danger classes be be used
2016-08-11 12:20:02 -04:00