cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 00:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
ac612d492486bb382aaf3362c7a39e6799cc9de2
Paradise/code/game/objects/items/weapons
History
Aurorablade 98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 
# Conflicts:
#	code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
..
grenades
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
implants
Polishes up the reset_view proc, which is basically
2016-12-21 17:56:57 -08:00
melee
Formal Captain Update
2016-08-08 19:01:37 -04:00
storage
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-31 22:38:14 -04:00
tanks
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-14 13:37:34 -08:00
AI_modules.dm
…
alien_specific.dm
…
bee_briefcase.dm
…
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
…
cigs.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
clown_items.dm
…
cosmetics.dm
…
courtroom.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
defib.dm
Fixes defib leaving people in deadchat, n2o paralyse time
2016-11-06 21:36:24 -08:00
dice.dm
e20 get logged
2016-11-20 01:42:22 +01:00
disks.dm
…
dna_injector.dm
Fix.
2016-11-19 18:29:43 -05: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
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
gift_wrappaper.dm
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -08:00
handcuffs.dm
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
holosign.dm
Janitorial Quality of Life Update (#5239)
2016-08-17 17:23:19 -04:00
holy_weapons.dm
Nullrod istype Helpers
2016-10-19 03:09:17 -04: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
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-14 13:37:34 -08: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
…
tools.dm
Delays and Welder Repair Tweaks
2016-08-19 21:34:39 -04:00
twohanded.dm
further tweaks/fixes
2016-08-18 00:19:29 -04: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