cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-05 05:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
7a87e032637f258b83424995305584bdcc270708
Bubberstation/code/game/objects/items/weapons
History
phil235 194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor 
# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm
2016-09-29 01:44:27 +02:00
..
grenades
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
implants
Fix multiple href exploits from incorrectly scoped locates
2016-09-28 06:55:45 +00:00
melee
Officer's Sabre Tweaks (#20565)
2016-09-23 10:25:25 +12:00
storage
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
tanks
Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.
2016-09-27 19:58:27 +02:00
AI_modules.dm
…
airlock_painter.dm
…
cards_ids.dm
…
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
OKAY IT WILL WORK THIS TIME I HOPE OH GOD HELP ME
2016-09-26 21:23:51 -07:00
clown_items.dm
Adds canned laughter (#19405)
2016-07-21 10:10:46 +02:00
cosmetics.dm
…
courtroom.dm
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
defib.dm
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01: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
…
flamethrower.dm
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00
gift.dm
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
handcuffs.dm
Merge pull request #20475 from optimumtact/throwat
2016-09-13 15:41:00 +02:00
holosign_creator.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
holy_weapons.dm
Gives extradimensional chap weapon a unique gimmick. (#20112)
2016-08-27 10:00:36 -05:00
kitchen.dm
bone dagger now contains no materials (#20575)
2016-09-18 15:25:14 -05:00
manuals.dm
…
miscellaneous.dm
…
mop.dm
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
paint.dm
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
paiwire.dm
…
pneumaticCannon.dm
…
powerfist.dm
Hyper-kinetics will no longer cause gibtonite to instantly explode (#19677)
2016-08-05 17:51:12 -05:00
RCD.dm
Fixed being able to spam grilles on a single tile with an RCD.
2016-08-03 00:43:28 -07:00
RPD.dm
…
RSF.dm
…
scrolls.dm
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
sharpener.dm
…
shields.dm
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
signs.dm
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
singularityhammer.dm
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
stunbaton.dm
Stunbaton throw now only stuns living mobs (#20474)
2016-09-13 15:40:21 +02:00
teleportation.dm
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00
teleprod.dm
Stunprods no longer go into backpacks
2016-09-05 15:47:10 -03:00
tools.dm
Refactor the experimental welding tool slightly (#20646)
2016-09-24 16:49:35 -05:00
twohanded.dm
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
vending_items.dm
Vapes are coming to SS13 (#20629)
2016-09-25 20:21:59 +13:00
weaponry.dm
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00