cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,098 Commits 61 Branches 14 Tags
c07d8c23dc93bc28b7ae2f29bc582d992995a3ca
Commit Graph

2489 Commits

Author SHA1 Message Date
Rockdtben
c07d8c23dc Merge pull request #2645 from tkdrg/ultrahardelitebugfix 
Bugfix for #2627
 2014-02-09 23:01:14 -06:00
Tenebrosity
e1a0f96846 Merge branch 'master' of https://github.com/tgstation/-tg-station into bananfix 
Conflicts:
	code/game/objects/items/weapons/clown_items.dm
 2014-02-09 16:39:50 +13:00
Tkdrg
6245d00a4d Now with 100% more procs! 2014-02-08 18:22:56 -03:00
Tkdrg
c43ba64484 Merge branch 'master' of https://github.com/tkdrg/-tg-station into ultrahardelitebugfix 
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
 2014-02-08 17:50:31 -03:00
Tkdrg
c316ff3365 Nitpick, ho! 2014-02-08 14:58:51 -03:00
Razharas
c4c88036f8 Merge pull request #2479 from KazeEspada/nukeops 
Nuke op overhaul: part 1, the renaming. [MAP][NEEDS PLAY TESTING]
 2014-02-08 09:52:20 -08:00
Razharas
0efd94884e Merge pull request #2658 from Rockdtben/refactorMineralDoor 
Refactored Close() and Open()
 2014-02-08 04:32:42 -08:00
Razharas
4ea05add26 Merge pull request #2649 from YotaXP/lighting-squared 
Reduced the potency of carrying multiple light sources.
 2014-02-08 04:13:57 -08:00
Razharas
b19084569d Merge pull request #2624 from adrix89/Fixes 
Fixes
 2014-02-08 04:03:50 -08:00
Razharas
0aed48193c Merge pull request #2626 from adrix89/slip_rework2 
Slip rework the second encounter
 2014-02-07 12:24:08 -08:00
fleure
26d4625ee7 Merge pull request #2488 from Razharas/OkLetsTryThis 
Machines overhaul 2: MERGE LIKE SANIC
 2014-02-07 13:06:48 +00:00
fleure
bc733a83a4 Merge pull request #2650 from Giacom/master 
MiniStation Update
 2014-02-06 20:14:25 +00:00
Razharas
c0aa3b56bb Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 
Conflicts:
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/aifixer.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/power/apc.dm
	code/modules/research/server.dm
	icons/obj/stationobjs.dmi

Yeah nah time to merge this shit behore resolving conflicts will take more than 2 hours
 2014-02-06 22:05:39 +04:00
adrix89
5e05401541 properly fix rune cleaning 2014-02-06 17:35:48 +02:00
adrix89
02cf28a4f1 missed a rune check 2014-02-06 17:13:01 +02:00
adrix89
dfa1c8c363 Fine! removed ability to clean up runes 2014-02-06 09:12:32 +02:00
Rockdtben
d5ccdb6ef1 fixes resin doors 2014-02-05 22:44:31 -06:00
YotaXP
d2e5c3a51b Inserting lights into containers should no longer dim other lights. 2014-02-05 23:05:29 -05:00
Rockdtben
216026ae82 Refactored Close() and Open() 2014-02-05 19:00:35 -06:00
Tenebrosity
6f202788ea Fixes #2396 and #2395 
- Banana peels are now grown weapons
- Banana peel slip duration is now based on their potency
- Clown spawns with a 50 potency banana, which is both regular sized and
produces a skin that's nice and slippery~
- Fixes nettle and deathnettle inhands not disappearing upon use
- Makes nettle and deathnettles use the hitsound variable instead of the
playsound proc directly. Now their hitsounds will scale in volume based
on damage done.
- Makes the banana mortar shoot potency 65 banana peels. Because
otherwise it'd shoot laughably tiny and short in slip duration potency
-1 ones.
- Moves corncobs to be grown weapons and updates their paths. Now their
size will scale based on the size of the corn that spawned them.
- Updates banan paths :)
 2014-02-06 13:47:39 +13: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
YotaXP
6db2c59772 Reduced the potency of carrying multiple light sources. 2014-02-05 16:54:46 -05: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
Tkdrg
61a8a25e1a Fixes #2627 and line endings (?). 2014-02-05 15:03:15 -03:00
fleure
0c179d29bf Merge pull request #2621 from Neerti/SecBeltsReloadedAgain 
Sec Belt quickfix
 2014-02-05 13:13:59 +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
1e9a85b672 Merge branch 'master' of https://github.com/tgstation/-tg-station 
Merge branch 'master' of https://github.com/tgstation/-tg-station

Spray bottles doesn't make floor wet anymore.
Wet floor nerfed
Slight soap and banana buff.
Cult runes are now cleanable by soap and space cleaner.
You can clean with holy water.

Soap cleaning and uses.

Reworked spray

Revert soap uses, if there are not easily accessible,they are fine.

Revert fixes
 2014-02-04 20:00:57 +02:00
adrix89
7aa8225e2a Revert stuff keep fixes 2014-02-04 19:38:58 +02:00
Neerti
bdd288174a I love invalid paths, don't you? 2014-02-04 10:28:55 -05:00
Aranclanos
a1104a459d Merge branch 'hrefs-in-log' of https://github.com/Limeliz/-tg-station into hrefs-in-log 
Conflicts:
	code/game/objects/items/devices/transfer_valve.dm
 2014-02-04 08:34:18 -03:00
adrix89
ba1c517ad1 Grill bugfix 2014-02-04 11:49:22 +02:00
KazeEspada
45dd35d1a7 Merge branch 'master' of https://github.com/tgstation/-tg-station into nukeops 
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm

Resolved
 2014-02-04 01:41:27 -07:00
Razharas
8dc864d819 Merge pull request #2605 from Neerti/SecBeltsReloaded 
Attempt 2: Stun Batons can now go on your belt.
 2014-02-03 21:49:45 -08:00
Razharas
9092bf5c1c Merge pull request #2438 from adrix89/attack_override 
Attack override
 2014-02-03 21:31:35 -08:00
Razharas
ee3b0a77ca Merge pull request #2598 from tkdrg/morebagsyay 
Book bags for the librarian
 2014-02-03 20:20:04 -08:00
Mercenaryblue
35976a9cf8 Update fitness.dm 
Adds LaserTag helmets to fitness lockers.
 2014-02-03 23:02:12 -05:00
fleure
2f0ca13d45 Merge pull request #2575 from Jordie0608/truebagshavenolimitations 
Bag of holding now holds everything
 2014-02-03 10:47:44 -08:00
Cheridan
ad235cf18f Merge pull request #2563 from Razharas/NewTables 
New PR for crafting tables
 2014-02-03 08:46:56 -08:00
adrix89
5bfe0cbd61 Merge branch 'master' of https://github.com/tgstation/-tg-station into attack_override 
Conflicts:
	code/_onclick/item_attack.dm
 2014-02-03 18:07:45 +02:00
adrix89
c1ae410869 Fixes 1653 
Projectiles now have a layer threshold 2.75 which is the spiderlings layer.
 2014-02-03 17:15:49 +02:00
Neerti
100585b33a Enables the baton and classic baton to go on your belt. Adds an additional slot in the belt so you won't have to make room. 2014-02-03 01:31:39 -05:00
Cheridan
5b5d7eecb9 Merge pull request #2592 from Tenebrosity/git_gud_shoes 
Fixes grammar of examine messages for objects that are pairs
 2014-02-02 16:36:57 -08:00
Cheridan
e60ecbb1f4 Merge pull request #2590 from GarrusVakarian/issue#2436fix 
Fixed issue #2436 (Classic baton stuns borgs)
 2014-02-02 16:08:45 -08:00
adrix89
f9c0e171f1 Revert soap uses, if there are not easily accessible,they are fine. 2014-02-02 20:57:51 +02:00
Tenebrosity
6ae7051977 Removes an if check based on Pete's suggestion 
Thanks
 2014-02-03 06:18:34 +13:00
GarrusVakarian
94bbf55ce3 Adapted code to Jordie0608's fix 2014-02-02 18:01:46 +01:00