cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-06-06 22:59:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
209fa5ffe61bf448fca5aa8cb3cc9b05bf3e2819
Bubberstation/code/game/objects/items/weapons
T
History
phil235 99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/modules/reagents/chemistry/holder.dm
2016-02-06 20:38:16 +01:00
..
grenades
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
implants
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
melee
…
storage
Bulldog Fix
2016-02-05 12:06:53 -06:00
tanks
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-06 15:42:13 +01:00
AI_modules.dm
…
airlock_painter.dm
…
cards_ids.dm
…
chrono_eraser.dm
…
cigs_lighters.dm
…
clown_items.dm
- you now only see turfs when inside gas pipes.
2016-02-04 00:33:16 +01:00
cosmetics.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
courtroom.dm
…
defib.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
dice.dm
…
dna_injector.dm
…
explosives.dm
Storage items now drop loot upon destruction.
2016-01-31 13:01:36 -07:00
extinguisher.dm
…
flamethrower.dm
…
gift_wrappaper.dm
…
handcuffs.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
janisigns.dm
…
kitchen.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
manuals.dm
…
mop.dm
…
paint.dm
…
paiwire.dm
…
pneumaticCannon.dm
…
RCD.dm
…
RPD.dm
Merge Conflict Fix
2016-01-27 13:29:38 +02:00
RSF.dm
…
scrolls.dm
…
shields.dm
…
signs.dm
…
singularityhammer.dm
…
stunbaton.dm
Some assembly requaired
2016-01-26 02:43:08 +03:00
teleportation.dm
…
teleprod.dm
…
tools.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
twohanded.dm
…
vending_items.dm
…
weaponry.dm
Some assembly requaired
2016-01-26 02:43:08 +03:00