cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 12:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
fc059ab4e8af1bfa97e0ea521ede9ee49672ddb8
VOREStation/code/game/objects/items/weapons
History
Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
2016-07-03 16:21:21 -04:00
..
circuitboards
Make FBPs Constructable
2016-05-30 02:13:55 -04:00
grenades
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-07-03 16:21:21 -04:00
implants
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-07-03 16:21:21 -04:00
material
Spear fix + a change
2016-06-08 03:54:44 +01:00
melee
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
storage
#MoreDice2016 (#2016)
2016-07-03 19:48:28 +01:00
tanks
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
AI_modules.dm
…
autopsy.dm
Adds do_surgery() behaviour for various items
2016-06-17 19:06:56 +01:00
candle.dm
…
cards_ids_syndicate.dm
…
cards_ids.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2016-06-14 16:48:00 -04:00
cigs_lighters.dm
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
clown_items.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall
2016-05-28 20:22:09 +01:00
cosmetics.dm
Construction Update
2016-03-25 16:02:36 -04:00
dice.dm
#MoreDice2016 (#2016)
2016-07-03 19:48:28 +01:00
dna_injector.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall
2016-05-28 20:22:09 +01:00
explosives.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall
2016-05-28 20:22:09 +01:00
extinguisher.dm
Ports event system from Bay
2016-06-01 22:05:04 +01:00
flamethrower.dm
Construction Update
2016-03-25 16:02:36 -04:00
game_kit.dm
…
gift_wrappaper.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall
2016-05-28 20:22:09 +01:00
handcuffs.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall
2016-05-28 20:22:09 +01:00
hydroponics.dm
…
improvised_components.dm
Lets spears be made from butterfly knifes as well as shards.
2016-06-07 19:42:11 +01:00
manuals.dm
…
mop_deploy.dm
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
mop.dm
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
paint.dm
…
paiwire.dm
…
policetape.dm
Mapped tape rolls can now apply themselves.
2016-05-26 17:53:00 +01:00
power_cells.dm
…
RCD.dm
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
RSF.dm
Ports GinjaNinja32's drinks rewrite from Bay
2016-06-06 20:33:11 +01:00
scrolls.dm
…
shields.dm
Adds a bunch of stuff for sec armor. See PR for details.
2016-03-06 04:18:39 -05:00
stunbaton.dm
Fixes disarm-attacking being very likely to break the limb before dislocating it.
2016-06-19 23:58:16 +01:00
surgery_tools.dm
…
swords_axes_etc.dm
Fixes missing cooldowns, missing cult blade sound.
2016-04-22 04:58:25 -04:00
syndie.dm
…
tape.dm
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
teleportation.dm
…
tools.dm
Ports event system from Bay
2016-06-01 22:05:04 +01:00
towels.dm
Adds towels to fitness vendor, color is randomised
2016-06-13 20:19:52 +01:00
traps.dm
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
trays.dm
Slight optimization in dropped, adds colors to material items.
2016-01-14 18:29:49 -05:00
weaponry.dm
Fixes missing cooldowns, missing cult blade sound.
2016-04-22 04:58:25 -04:00
weldbackpack.dm
…