cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 11:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
ffbc6dbdf54a08be0fdc6866309a72dbb104d262
Bubberstation/code/game/objects/items/weapons
History
phil235 e74de9b357 Merge branch 'master' of https://github.com/tgstation/-tg-station into damage_fix 
# Conflicts:
#	code/modules/mob/living/carbon/carbon_defense.dm
2016-10-16 12:19:48 +02:00
..
grenades
Blobs now properly consider flashbangs to be energy damage
2016-10-11 19:55:19 -04:00
implants
Contents_explosion() tweaks (#20934)
2016-10-16 10:01:37 +13:00
melee
remake (#20762)
2016-10-11 09:41:43 +13:00
storage
Merge branch 'master' of https://github.com/tgstation/-tg-station into damage_fix
2016-10-16 12:19:48 +02:00
tanks
Replaces yet more istypes with helpers (#20806)
2016-10-10 17:48:35 +13:00
AI_modules.dm
…
airlock_painter.dm
Adds a few turf istype helpers (#20754)
2016-10-01 19:25:46 +02:00
cards_ids.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
chrono_eraser.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
cigs_lighters.dm
More vape refillers (#20821)
2016-10-10 19:22:41 +02:00
clown_items.dm
Replaces a bunch of istypes with their proper macros (#20739)
2016-09-30 20:21:08 +02:00
cosmetics.dm
Added priority overlay system. (#18225)
2016-06-17 10:11:53 +12:00
courtroom.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
defib.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
dice.dm
Fix a bunch of incorrect throw_at proc definitions that caused a runtime
2016-09-12 22:09:52 +00:00
dna_injector.dm
ports high priority critical fix from vg
2016-08-16 16:40:40 -07:00
explosives.dm
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00
extinguisher.dm
extinguisher is now caught up with fastmos.
2016-10-13 11:57:11 +09:00
flamethrower.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
gift.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
handcuffs.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
holosign_creator.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
holy_weapons.dm
Gives extradimensional chap weapon a unique gimmick. (#20112)
2016-08-27 10:00:36 -05:00
kitchen.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
manuals.dm
…
miscellaneous.dm
Adds skub to the Autodrobe as a premium item
2016-06-28 17:23:38 -07:00
mop.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
paint.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
paiwire.dm
…
pneumaticCannon.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
powerfist.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
RCD.dm
RCD QoL buffs; windows and girders (#20903)
2016-10-14 10:17:07 +13:00
RPD.dm
Replaces yet more istypes with helpers (#20806)
2016-10-10 17:48:35 +13:00
RSF.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
scrolls.dm
Merge pull request #20894 from lzimann/cancelbuttons
2016-10-11 07:38:36 -05:00
sharpener.dm
…
shields.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
signs.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
singularityhammer.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
stunbaton.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
teleportation.dm
Merge pull request #20894 from lzimann/cancelbuttons
2016-10-11 07:38:36 -05:00
teleprod.dm
Stunprods no longer go into backpacks
2016-09-05 15:47:10 -03:00
tools.dm
POWER TOOLS TAKE 2. (#20923)
2016-10-14 10:19:23 +13:00
twohanded.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
vending_items.dm
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
weaponry.dm
Removes the bloodthirst mechanic + more changes (#20851)
2016-10-10 11:26:43 +13:00