cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,461 Commits 61 Branches 14 Tags
b565b2125ee30c07c079f38bf64f0f97129a7d1a
Commit Graph

383 Commits

Author SHA1 Message Date
Cheridan
011a78f478 Merge pull request #2902 from Miauw62/actualbranchnamesyounerd 
Fixes NODROP not playing nice with tables.
 2014-02-25 22:37:09 -06:00
Cheridan
004b005ab2 Merge pull request #2901 from Miauw62/aijgdiajgiojdaigjapgijsgdipjagiojaranisafagaidpjgiaopjgdoiadjgaipgjpijadgijagipjadijigpaijgdipajgdipajdgpiadjgpajgd 
Fixed #2899 (NODROP and closets doing weird shit)
stop making retarded branch names miauw
 2014-02-25 22:29:39 -06:00
Cheridan
5ec24c8613 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk 
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/modules/reagents/Chemistry-Reagents.dm

resolved with Theirs, must manually reapply fixes
 2014-02-25 19:39:26 -06:00
Miauw
41a9321d2a rip in peace more parems 2014-02-24 19:43:09 +01:00
Miauw
27d0b64032 Fixes NODROP not playing nice with tables. 
(thx for submitting bug reports guise)
 2014-02-24 19:38:10 +01:00
Miauw
8ed2cdb07a Fixed #2899 2014-02-24 19:25:57 +01:00
Razharas
3d90e8815e Merge pull request #2827 from Ergovisavi/muh_vision 
Adding NVG's/Advanced Mesons to the protolathe, some human vision changes
 2014-02-24 07:55:34 -08:00
Razharas
c31c76b4ab Quick fix for tables, lockers and general drop_item 
Shall do the trick
 2014-02-21 05:15:40 +04:00
ChuckTheSheep
95bc337d62 A lot of Stuff From: #2849 
https://github.com/tgstation/-tg-station/pull/2849
 2014-02-20 13:28:07 -05:00
Ergovisavi
62ab59b128 Changed the typepath of HUD sunglasses to be a child of the security hud 
Removed all the istype checks for glasses in humans
Added advanced mesons (Old meson functionality of removing darkness overlay) and NVG's to the protolathe
 2014-02-17 21:00:46 -08:00
Ergovisavi
1749d38d56 Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul 
Fixed possible runtime issue with Jaunters, fixed merge issues, changed mining points to examine from attack self
 2014-02-16 19:36:48 -08:00
Razharas
be73e9d09f Merge pull request #2771 from fleure/eggs 
Increased egg hatch rate and reduced chicks in crate
 2014-02-16 08:37:49 -08:00
Hornygranny
9323c35a51 fixed disastrous and shameful failure 2014-02-13 19:16:53 -08:00
hornygranny
e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
Fleure
cf4f6dcef2 Reduced number of possible chicks from a chicken crate 2014-02-13 19:20:14 +00:00
Ergovisavi
892ffd3879 Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul 2014-02-09 22:37:20 -08:00
Ergovisavi
bf17c3328e Asteroid Overhaul v1.0 
Mining Equipment Locker and associated items
Asteroid map rework
Mining Mob rebalancing
Minor fixes
 2014-02-09 19:51:05 -08:00
Razharas
0efd94884e Merge pull request #2658 from Rockdtben/refactorMineralDoor 
Refactored Close() and Open()
 2014-02-08 04:32:42 -08:00
fleure
bc733a83a4 Merge pull request #2650 from Giacom/master 
MiniStation Update
 2014-02-06 20:14:25 +00:00
Rockdtben
d5ccdb6ef1 fixes resin doors 2014-02-05 22:44:31 -06:00
Rockdtben
216026ae82 Refactored Close() and Open() 2014-02-05 19:00:35 -06:00
Rockdtben
6a9a7896c6 Merge pull request #2380 from Aranclanos/MineralDoors 
Mineral doors, small fixes.
 2014-02-05 18:20:21 -06:00
Giacomand
7319456770 MiniStation Update 
Fixes a runtime with the vent clogging event, which happens to MiniStation.
Lowered all vent requirements to 20.
Fixed transit tubes from breaking by reversing the pod direction twice.
Changed the icon state name of the terminators so that they had density.
Transit tubes will now reset the view of the mob exiting.
 2014-02-05 22:04:58 +00:00
fleure
26afced91b Merge pull request #2629 from Giacom/master 
MiniStation Update
 2014-02-05 18:38:03 +00:00
fleure
fd81304128 Merge pull request #2612 from Mercenaryblue/master 
The LaserTag update: Part one
 2014-02-05 18:31:08 +00:00
Mercenaryblue
c3a2861bf8 Update fitness.dm 
Extra kits in the lockers
 2014-02-04 21:53:17 -05:00
Razharas
061b6aab4a Merge pull request #2607 from adrix89/Fix_1653 
Fix 1653
 2014-02-04 17:40:30 -08:00
Giacomand
b8329e7f2b Fixed a few map bugs on MiniStation. 
Added the missing mini-hoe and hatchet to the garden area.
Added reverse stations which will send pods in the opposite direction, after their stop.
Added tube terminators for you to put on the end of non-looping tubes.
 2014-02-04 20:13:07 +00:00
adrix89
ba1c517ad1 Grill bugfix 2014-02-04 11:49:22 +02:00
Mercenaryblue
35976a9cf8 Update fitness.dm 
Adds LaserTag helmets to fitness lockers.
 2014-02-03 23:02:12 -05:00
Cheridan
ad235cf18f Merge pull request #2563 from Razharas/NewTables 
New PR for crafting tables
 2014-02-03 08:46:56 -08:00
fleure
97b99e47f6 Merge pull request #2558 from MrPerson/rollerbeds 
Fixes rollerbeds and their offsets so they don't look stupid.
 2014-01-31 14:13:51 -08:00
Razharas
b4f011bacb Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/power/cable.dm

Fixing conflicts
 2014-01-31 05:20:59 +04:00
fleure
6c07d2bae2 Merge pull request #2549 from Incoming5643/PussyGalore 
Fixes the fucking cat crate jesus christ goddamn
 2014-01-30 14:56:50 -08:00
Incoming
a8aff5e534 Fixes the Fix, wouldn't want people getting two corgis for the price of one, no that'd be terrrrrrrible 2014-01-30 10:52:32 -05:00
MrPerson
b4d2ba33cb Fixes rollerbeds and their offsets so they don't look stupid. 2014-01-30 06:02:46 -08:00
Incoming
40cd679747 Fixes Cat Crates, Corgi Crates and Chick crates. 
File bug reports you guys, seriously.
 2014-01-29 19:20:26 -05:00
Razharas
3023f12ff9 Returned to the forces of light thanks to gia 
No more text paths, only normal paths
 2014-01-26 05:42:34 +04:00
Ergovisavi
45cfb68ac5 Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs 2014-01-24 23:12:01 -08:00
Razharas
c17de66cbc Added chem handling and IED recipe 
Uh oh
 2014-01-24 03:55:09 +04:00
Ergovisavi
3b6208eae1 Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash 
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.
 2014-01-22 20:37:47 -08:00
Razharas
2717aed93c Some recipes and addable parts 
Indeed
 2014-01-23 04:07:28 +04:00
Miauw
4bdffc2dc3 Merge branch 'master' of https://github.com/tgstation/-tg-station into somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-01-22 17:01:20 +01:00
Razharas
e1d14793a0 Return to the text paths 
Yes byond doesnt let me use normal paths as association for numbers
 2014-01-22 07:51:11 +04:00
Razharas
ea54257ab6 Ported cable coils to stacks crudely 
Yeah
 2014-01-22 02:11:19 +04:00
Razharas
bab69a6bf8 Added tools and time handling 
Well yeah
 2014-01-22 02:11:17 +04:00
Razharas
1c394dd334 Implemented crude crafting 
Debug messages are still inside, pushing only cozx pete asked me to
 2014-01-22 02:11:16 +04:00
Pete Goodfellow
e8ed1a83f7 Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
 2014-01-20 19:29:47 +00:00
Miauw
13b3cd69f2 Adds changeling arm blades that can slice tables apart and break computers and generally be robust. 2014-01-19 18:33:03 +01:00
Pete Goodfellow
5222191b73 Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket. 
Also makes ties show up on the jumpsuit object.
 2014-01-19 14:50:27 +00:00