cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,016 Commits 61 Branches 14 Tags
a589387ccfebee2e892f15c3a40a3bb4792fe4fe
Commit Graph

8022 Commits

Author SHA1 Message Date
Razharas
a589387ccf Fixing merge conflicts 
THis is getting harder and harder
 2014-02-06 22:26:16 +04: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
Tenebrosity
2b978e5da7 Fixes merge conflicts and removes excess message 2014-02-06 20:30:43 +13:00
Razharas
131f5f224d Merge pull request #2659 from MrPerson/emitter_runtime 
Emergency fix for a projectile runtime
 2014-02-05 21:39:08 -08:00
MrPerson
41d1189156 Emergency fix for a projectile runtime 
Emitters (and probably turrets) never clicked anything so this var is null. Starting the singulo = emitter shots never move and runtime constantly.
 2014-02-05 21:28:54 -08:00
Rockdtben
6a9a7896c6 Merge pull request #2380 from Aranclanos/MineralDoors 
Mineral doors, small fixes.
 2014-02-05 18:20:21 -06:00
Cheridan
5c253c9259 Merge pull request #2644 from Razharas/CableCoilsFixings 
Fixes cable coils
 2014-02-05 13:14:59 -06: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
Razharas
caea1d5108 Fixes cable coils 
So glad can code again, probably addicted to it
 2014-02-05 19:45:33 +04:00
fleure
0c179d29bf Merge pull request #2621 from Neerti/SecBeltsReloadedAgain 
Sec Belt quickfix
 2014-02-05 13:13:59 +00:00
MrPerson
931da9e7ef Many changes 
Much diff
 2014-02-04 22:49:38 -08:00
Mercenaryblue
c3a2861bf8 Update fitness.dm 
Extra kits in the lockers
 2014-02-04 21:53:17 -05:00
Mercenaryblue
1d55017853 Update supplypacks.dm 
Added an extra kit to the supply crate.
 2014-02-04 21:50:54 -05:00
Razharas
061b6aab4a Merge pull request #2607 from adrix89/Fix_1653 
Fix 1653
 2014-02-04 17:40:30 -08:00
Giacomand
a27a03c11f The infestation events will now work correctly on MiniStation. 2014-02-04 20:26:30 +00: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
fleure
11d8a9e2f3 Merge pull request #2608 from Cheridan/papersplease 
Fixes issue 2560 - blueprint photos not counting for objectives
 2014-02-04 09:57:59 -08:00
Neerti
bdd288174a I love invalid paths, don't you? 2014-02-04 10:28:55 -05:00
Mloc-Argent
a677ae8377 Adds crlf default to .gitattributes for most text file types we use. 
Massive green/red is to the best of my knowledge caused by files being nearly entirely LF.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-02-04 15:14:39 +00:00
Mercenaryblue
e2293f5de6 Update supplypacks.dm 
Renamed crate.
 2014-02-04 09:00:45 -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
Razharas
a6157132b5 Merge pull request #2569 from Tenebrosity/box2550Away-update 
Makes box2550away unsimulated and more
 2014-02-03 23:34:45 -08:00
Tenebrosity
fd8be7edc2 Updates box2550away (again) (again) (again) 
Uses the map tools, but edits a lot of paths.

Makes box2550away unsimulated to combat lag
Adds three new unsimulated floors, which are just copies of simulated
ones
Adds four new unsimluated walls, which are just copies of simulated ones
Breaks telescreens as they don't work off the station
Adds the escape shuttle to the map as it has the penultimate HONK clue
paper on it and replaces the shuttle console with a fake
Adds a needed stat check to security camera computers
Gets rid of disposal overlays on box2550away toilets
Replaces box2550away status displays with fakes
Fixes a bug with entertainment monitors where they had no broken icon
due to being in status_display.dmi instead of stationobjs.dmi
Adds a carpet icon ("carpet2") that was present in 2010 and is used in
box2550away back to floors.dmi
Changes disposal related user messages so they refer to the name var of
the disposal object. This makes the messages refer to my disposal
toilets as toilets instead of diposals.
Removes the non-slip flag of SWAT shoes in the armoury.

God I hope I committed all the files I changed.
 2014-02-04 20:30:13 +13:00
Razharas
283785fccb Merge pull request #2593 from Jordie0608/boomgoesthebaton 
Makes badminbombs delete after detonating
 2014-02-03 23:08:05 -08:00
Razharas
2ac38e0706 Merge pull request #2557 from Tenebrosity/awaycorpsespawnerfix 
Fixes away map dead slime and AI spawners
 2014-02-03 23:05:25 -08:00
Razharas
2521ffa68a Merge pull request #2597 from hornygranny/secbot 
Secbots will not longer arrest people through obstacles
 2014-02-03 22:56:50 -08:00
Hornygranny
c7cba0a257 Combined if statements for non-shittery 2014-02-03 22:43:08 -08:00
Razharas
6a53a9888a Merge pull request #2545 from Cheridan/objectives 
Objective Refactor
 2014-02-03 22:27:26 -08:00
Hornygranny
25687d0360 Beepsky will no longer attack you inside of lockers + other things 2014-02-03 22:25:50 -08:00
Razharas
43a5b6a605 Merge pull request #2583 from Incoming5643/bugfixenfeb 
Various Bugfixes
 2014-02-03 22:05:18 -08: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
25c6175e5c Merge pull request #2606 from Neerti/FastBatonCharging 
Batons will now only take ten seconds to recharge fully.
 2014-02-03 21:43:38 -08:00
Razharas
9092bf5c1c Merge pull request #2438 from adrix89/attack_override 
Attack override
 2014-02-03 21:31:35 -08:00
Razharas
b21191875a Merge pull request #2595 from GarrusVakarian/issue#2432fix 
Fixed issue #2432. Also fixed for ED209 (had the same issue).
 2014-02-03 20:29:57 -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
0fbe43757d Update ed209bot.dm 
Change assembly for the LaserTag ED-209s to include the new Tag Helmets.
 2014-02-03 23:11:52 -05:00
Mercenaryblue
35976a9cf8 Update fitness.dm 
Adds LaserTag helmets to fitness lockers.
 2014-02-03 23:02:12 -05:00
Mercenaryblue
507e8c0992 Update helmet.dm 
Adds Laser Tag Helmets to the game.
They provide about the same protection as a hardhat.
 2014-02-03 22:57:48 -05:00
Mercenaryblue
2d3c91af83 Update supplypacks.dm 
Adds a lasertag crate
 2014-02-03 22:53:06 -05:00
fleure
43db629b4d Merge pull request #2599 from Ergovisavi/mobs_hate_mechs 
Fixes issue #555
 2014-02-03 13:41:28 -08:00
fleure
2f0ca13d45 Merge pull request #2575 from Jordie0608/truebagshavenolimitations 
Bag of holding now holds everything
 2014-02-03 10:47:44 -08:00
fleure
0d68be7931 Merge pull request #2564 from Tenebrosity/fallsounds 
Fixes thuds in space and code for hats falling off
 2014-02-03 10:41:59 -08:00
fleure
a854a41994 Merge pull request #2540 from Incoming5643/blobjob 
BE_BLOB and easy adminblobing
 2014-02-03 10:34:31 -08:00
Cheridan
75fde99810 Fixes issue 2560 - blueprint photos not counting for objectives 
wow lets use the same name for our object variables and all our arguments and parameters this will never make things terrible
ever
 2014-02-03 12:23:16 -06: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
6b0ae601b5 Increased the rate batons are recharged to 1500 a second, so it takes ten seconds to fully recharge the 15k cell inside. 2014-02-03 01:54:04 -05:00