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
b94cf14b8abb71419b7c960fef76b7d53ee67ba1
Bubberstation/code/game/objects/items
History
Bawhoppen 7f73fd2a7b Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
2020-03-12 05:06:09 -05:00
..
circuitboards
book console fix (#49696)
2020-03-05 21:38:40 +08:00
devices
Fixes empty tape recorders getting stuck on pocket and belt slots (#49865)
2020-03-11 15:26:39 -04:00
grenades
Merge pull request #48959 from Ryll-Ryll/embeddead
2020-02-24 15:43:36 +08:00
implants
Update implant_mindshield.dm
2020-02-17 16:06:01 -08:00
melee
[READY] Meat material & material datum turf support (#49402)
2020-03-04 23:18:08 +08:00
robot
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00
stacks
Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
2020-03-12 05:06:09 -05:00
storage
Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
2020-03-12 05:06:09 -05:00
tanks
Fix on station jet air using and trails only on use. (#49567)
2020-03-08 20:35:10 -04:00
tools
Add lints for "new" override prevention feature (#49672)
2020-03-05 10:22:19 -05:00
AI_modules.dm
…
airlock_painter.dm
airlock painter
2020-02-27 15:17:06 -06:00
apc_frame.dm
…
binoculars.dm
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00
blueprints.dm
…
body_egg.dm
…
bodybag.dm
…
broom.dm
Brooms Upgraded: Disposal Bin Edition (#49433)
2020-03-05 20:57:20 +08:00
candle.dm
…
cardboard_cutouts.dm
makes setDir shouldcallparent (#49692)
2020-03-05 10:20:35 -05:00
cards_ids.dm
…
chainsaw.dm
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00
charter.dm
Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
2020-02-22 22:35:53 +13:00
chromosome.dm
…
chrono_eraser.dm
Merge pull request #49421 from ShizCalev/define-cleanup
2020-02-20 19:32:36 +08:00
cigs_lighters.dm
Update cigs_lighters.dm
2020-02-27 15:52:05 -07:00
clown_items.dm
haha funny line
2020-02-18 20:02:03 -08:00
control_wand.dm
…
cosmetics.dm
…
courtroom.dm
…
crab17.dm
Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
2020-02-22 22:35:53 +13:00
crayons.dm
The Families Gamemode. Home. At least it was 'til I fucked everything up. (#49274)
2020-03-08 18:33:54 -07:00
credit_holochip.dm
…
debug_items.dm
…
defib.dm
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00
dehy_carp.dm
…
dice.dm
Removes unnessacary math defines
2020-02-17 23:09:09 -05:00
dna_injector.dm
…
documents.dm
…
dualsaber.dm
fixes toy dualsabers gaining damage (#49789)
2020-03-10 17:16:10 -04:00
eightball.dm
…
etherealdiscoball.dm
…
extinguisher.dm
…
fireaxe.dm
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00
flamethrower.dm
…
gift.dm
…
granters.dm
I tested block in a few spares and it was too easy to just sit behind it and tank if they had a baton
2020-02-24 22:32:30 +11:00
handcuffs.dm
removing unnecesary double parent proc calls (#49694)
2020-03-05 18:51:37 +08:00
his_grace.dm
Removes unnessacary math defines
2020-02-17 23:09:09 -05:00
holosign_creator.dm
…
holy_weapons.dm
Adds Religious Sects and Basic Technophile Sect for Proof of Concept (#49434)
2020-03-06 11:11:52 +08:00
hot_potato.dm
Removes unnessacary math defines
2020-02-17 23:09:09 -05:00
hourglass.dm
…
inducer.dm
[READY] Space Suits use cells and warm the wearer (#49028)
2020-02-15 11:32:54 +13:00
kitchen.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
2020-02-27 17:12:47 -06:00
latexballoon.dm
…
manuals.dm
…
miscellaneous.dm
Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
2020-02-22 22:35:53 +13:00
mop.dm
…
paint.dm
…
paiwire.dm
…
pet_carrier.dm
…
pinpointer.dm
…
pitchfork.dm
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00
plushes.dm
Adds mothperson plushie (#49732)
2020-03-06 14:13:56 +08:00
pneumaticCannon.dm
the span of these changes is immense (#49432)
2020-02-20 13:48:13 +01:00
powerfist.dm
…
puzzle_pieces.dm
Map fixes, and 1-2 QOL improvements. (#49690)
2020-03-05 19:42:52 +08:00
RCD.dm
…
RCL.dm
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00
religion.dm
Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
2020-02-22 22:35:53 +13:00
RPD.dm
…
RSF.dm
…
scrolls.dm
…
sharpener.dm
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00
shields.dm
…
shooting_range.dm
…
signs.dm
…
singularityhammer.dm
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00
spear.dm
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00
stunbaton.dm
Removes the Double Baton 'Tech' / Fixes targeting issues related to the stunbaton (#49774)
2020-03-08 20:34:26 +08:00
taster.dm
…
teleportation.dm
Hand Tele try place portal ahead of user.
2020-03-05 13:21:47 +02:00
teleprod.dm
…
theft_tools.dm
Remove ismovableatom macro (#9)
2020-02-17 15:03:16 +01:00
toys.dm
fixes toy dualsabers gaining damage (#49789)
2020-03-10 17:16:10 -04:00
trash.dm
…
vending_items.dm
…
wayfinding.dm
…
weaponry.dm
[READY] Two Handed Component (#49422)
2020-03-04 11:26:01 +13:00