cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 21:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
7f2f766f70dcc8fb8f5bdce63f71fc707eecbb16
Paradise/code/game/objects/items/weapons
History
Fox McCloud 7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk 
# Conflicts:
#	code/game/objects/structures/window.dm
2018-06-03 18:49:44 -04:00
..
grenades
Merge pull request #9025 from Anasari/BombToInvestigate
2018-05-25 17:58:13 -07:00
implants
Them
2018-05-25 18:34:28 -07:00
melee
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
storage
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
tanks
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
AI_modules.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
alien_specific.dm
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
bee_briefcase.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
cards_ids.dm
Ports TG Components
2018-04-21 01:22:50 -04:00
cash.dm
…
caution.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
chrono_eraser.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
cigs.dm
Conjugating verbs is hard
2018-05-25 18:34:23 -07:00
clown_items.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
cosmetics.dm
Small fixes
2018-05-25 18:39:38 -07:00
courtroom.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
defib.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
dice.dm
Uses define instead of "bombs" for styling reason. Fixes IED not logging into investigate due to its special mechanism.
2018-05-18 12:23:08 +08:00
disks.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
dna_injector.dm
Completely Overhaul Logging
2018-04-19 15:07:59 -08:00
dnascrambler.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
explosives.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
extinguisher.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
fireworks.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
flamethrower.dm
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
garrote.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
gift_wrappaper.dm
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
handcuffs.dm
Completely Overhaul Logging
2018-04-19 15:07:59 -08:00
highlander_swords.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
holosign.dm
Ports Holoprojectors
2018-04-30 00:24:46 -04:00
holy_weapons.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
kitchen.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
legcuffs.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
lighters.dm
Small fixes
2018-05-25 18:39:38 -07:00
manuals.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
misc.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
mop.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
paint.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
paiwire.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
pneumaticCannon.dm
Their
2018-05-25 18:34:24 -07:00
powerfist.dm
Punches
2018-05-25 18:34:22 -07:00
RCD.dm
added defines for window construction states and full window diagonal dir
2018-06-03 13:11:37 +04:00
RCL.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
rpd.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
RSF.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
scissors.dm
Their
2018-05-25 18:34:24 -07:00
scrolls.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
shards.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
shields.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
signs.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
soap.dm
Fix coding style
2018-04-24 16:40:59 -05:00
staff.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
stock_parts.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
stunbaton.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
swords_axes_etc.dm
Completely Overhaul Logging
2018-04-19 15:07:59 -08:00
tape.dm
Small fixes
2018-05-25 18:39:38 -07:00
teleportation.dm
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
teleprod.dm
Them
2018-05-25 18:34:28 -07:00
tools.dm
Them
2018-05-25 18:34:28 -07:00
twohanded.dm
Merge remote-tracking branch 'upstream/master' into attack-hulk
2018-06-03 18:49:44 -04:00
vending_items.dm
Removes All Weapons
2018-04-15 16:25:56 -04:00
weaponry.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
whetstone.dm
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00