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

4325 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
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
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
MrPerson
931da9e7ef Many changes 
Much diff
 2014-02-04 22:49:38 -08: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
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
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
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
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
6a53a9888a Merge pull request #2545 from Cheridan/objectives 
Objective Refactor
 2014-02-03 22:27:26 -08:00
Razharas
43a5b6a605 Merge pull request #2583 from Incoming5643/bugfixenfeb 
Various Bugfixes
 2014-02-03 22:05:18 -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
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
fleure
43db629b4d Merge pull request #2599 from Ergovisavi/mobs_hate_mechs 
Fixes issue #555
 2014-02-03 13:41:28 -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
c1ae410869 Fixes 1653 
Projectiles now have a layer threshold 2.75 which is the spiderlings layer.
 2014-02-03 17:15:49 +02:00
Cheridan
d7f6afc8d2 Merge pull request #2600 from Aranclanos/PAdel 
fixes issue #2238
 2014-02-02 22:34:41 -08:00
Cheridan
04c1af2c16 Merge pull request #2577 from hornygranny/mobster 
Mobster items + shirt
he paid me off with a bugfix forgive me
 2014-02-02 21:45:42 -08:00
Ergovisavi
9288ca9d69 Fixes issue 555 by making hostile mobs run CanAttack() on the occupant of mechs 
Fixes Walking Shrooms not having full health when spawned due to the way their health is randomized on New()
Removes unncessary logging in friendly gold slime reactions, hostile ones retain logging.
Adds asteroid mobs, mushrooms, and holocarp to the blocked list for gold slime reactions.
 2014-02-02 18:52:36 -08:00
Hornygranny
7318aaeeae ORIGINAL CHARACTER DO NOT STEAL 2014-02-02 18:10:46 -08:00
Cheridan
b9f47fd412 Merge pull request #2573 from Giacom/MiniStation 
Updated the MiniStation map with some minor tweaks.
 2014-02-02 16:13:44 -08:00
Cheridan
edc38ce181 Merge pull request #2586 from GarrusVakarian/issue#2454fix 
Fixed issue #2454 (Ian loving people while dead)
do note however, that Ian still loves you very much
 2014-02-02 13:04:07 -08:00
Cheridan
ff9d551eae Merge pull request #2584 from Petethegoat/oops 
No more huge armbands. Fixes #2566.
 2014-02-02 11:58:03 -08:00
Tkdrg
e74088cfe5 Adds book bags to the biogenerator, costing 200 biomass. 2014-02-02 15:04:10 -03:00
Tenebrosity
e33f91229b Gameticker checks for mind in end of game readout 
This stops AI corpses showing up in the end of round report. It also
means that a ghosted (whether after death or by going catatonic) AI or
borg will now have its player shown at the end of the round.
 2014-02-03 05:27:03 +13:00
fleure
68abd1f0e4 Merge pull request #2510 from Tenebrosity/throwsounds 
Removes throwtapsound var from items
 2014-02-02 04:33:23 -08:00
fleure
153aae94e2 Merge pull request #2481 from Tenebrosity/projectileimpactnoises 
Adds generic impact noises to all projectiles
 2014-02-02 04:24:46 -08:00
Tenebrosity
c07ca6f1c4 Merge branch 'master' of https://github.com/tgstation/-tg-station into awaycorpsespawnerfix 2014-02-02 22:13:15 +13:00
Aranclanos
68fd365ae8 fixing the Del() of the control panel of the PA 2014-02-02 05:26:05 -03:00
Aranclanos
976e3457b4 added Del() calls for the PA structures/machines 2014-02-02 05:02:09 -03:00
Tkdrg
6fb71e6174 Added book bags. The librarian now spawns holding one. 2014-02-02 04:46:34 -03:00
Cheridan
00d85c344d Merge pull request #2547 from Ergovisavi/mushroom_hunter 
Walking Mushrooms will now hunt and eat eachother
hydroponics best department
 2014-02-01 21:14:28 -08:00
GarrusVakarian
f47ea4fb7b Adapted to programming standard 2014-02-02 04:57:57 +01:00
Cheridan
1d54687b2b Merge pull request #2477 from Tenebrosity/Branch_Branch_attacksounds 
Attack sounds for all melee weapons
 2014-02-01 18:01:59 -08:00
Incoming
c587f95d03 Changes the returns around for facehuggers to be inclusionary return 1 instead of exclusionary return 0 2014-02-01 20:44:17 -05:00
Aranclanos
17d466199c fixes issue 2587 2014-02-01 22:03:41 -03:00
GarrusVakarian
b274311f02 First commit! Fixed issue #2454 (Ian loving people while dead) 2014-02-02 00:10:03 +01:00
Pete Goodfellow
473505a6f0 Fixes #2566. 2014-02-01 22:04:22 +00:00
Hornygranny
0bc85a4f9e removed \improper from tommy gun 2014-02-01 13:55:46 -08:00
Incoming
45cf5ec20c Various Bugfixes 
Fixes #2534
Fixes #2431
Fixes #2493
Fixes #2500
 2014-02-01 11:29:37 -05:00