cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-16 08:37:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
8bede1db9901e6c0863d0ccb20c2c996f09fc334
Paradise/code/game/objects/items/weapons
T
History
Markolie 8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
2015-08-18 18:38:59 +02:00
..
grenades
Consistent bomb logging
2015-08-17 01:01:30 +02:00
implants
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
2015-08-18 18:38:59 +02:00
melee
…
storage
Merge pull request #1739 from Markolie/clicking
2015-08-14 21:32:37 -04:00
tanks
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
AI_modules.dm
Fix OneHuman law
2015-07-22 18:35:09 +02:00
alien_specific.dm
…
cards_ids.dm
Merge pull request #1713 from Markolie/master
2015-08-12 17:37:22 -04:00
cash.dm
…
caution.dm
…
chrono_eraser.dm
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
cigs.dm
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
clown_items.dm
Ports over Airhorns
2015-08-06 00:42:17 -04:00
cosmetics.dm
…
courtroom.dm
…
defib.dm
Pass 3
2015-07-08 01:34:53 -04:00
dice.dm
…
disks.dm
Updates Nuke Disk Spawning
2015-07-24 17:33:25 -04:00
dna_injector.dm
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
2015-08-18 18:38:59 +02:00
dnascrambler.dm
…
explosives.dm
Consolidate ?/FLW links under key_name_admin
2015-08-17 00:13:53 +02:00
extinguisher.dm
…
fireworks.dm
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
flamethrower.dm
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-16 23:28:02 +02:00
game_kit.dm
…
gift_wrappaper.dm
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
grenades.dm
Pass II
2015-07-09 19:51:40 -04:00
handcuffs.dm
Fix cable coil sprite
2015-08-03 06:37:12 +02:00
holosign.dm
…
hydroponics.dm
Consolidate ?/FLW links under key_name_admin
2015-08-17 00:13:53 +02:00
kitchen.dm
ERT Rework - Code Changes
2015-07-20 19:37:56 -04:00
legcuffs.dm
Consolidate ?/FLW links under key_name_admin
2015-08-17 00:13:53 +02:00
lighters.dm
…
manuals.dm
…
misc.dm
…
module.dm
…
mop.dm
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
paint.dm
…
paiwire.dm
…
power_cells.dm
…
RCD.dm
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
RSF.dm
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
scrolls.dm
…
shards.dm
IPC overhaul
2015-08-15 23:52:26 +02:00
shields.dm
…
signs.dm
…
soap.dm
…
staff.dm
…
stock_parts.dm
…
stunbaton.dm
Baton Fixes and Cattleprod Buff
2015-08-03 21:12:29 -04:00
surgery_limbattachment.dm
…
swords_axes_etc.dm
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
syndie_uplink.dm
…
syndie.dm
…
table_rack_parts.dm
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
tape.dm
…
teleportation.dm
…
tools.dm
Final IPC fixes (hopefully)
2015-08-16 03:43:20 +02:00
twohanded.dm
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
vending_items.dm
Aquariums and Pet Rocks!
2015-06-12 04:14:28 -04:00
weaponry.dm
Consolidate ?/FLW links under key_name_admin
2015-08-17 00:13:53 +02:00
wires.dm
…