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
9,970 Commits 61 Branches 14 Tags
2efdc43bdbe9cbcff52a1104c5bb706373cc9f13
Commit Graph

7980 Commits

Author SHA1 Message Date
Incoming
2efdc43bdb Gives mining borgs an analyzer so they can defuse gibingtonite properly 2014-02-05 13:16:04 -05: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
Razharas
061b6aab4a Merge pull request #2607 from adrix89/Fix_1653 
Fix 1653
 2014-02-04 17:40:30 -08: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
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
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
Cheridan
d7f6afc8d2 Merge pull request #2600 from Aranclanos/PAdel 
fixes issue #2238
 2014-02-02 22:34:41 -08: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
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
8762187a59 Merge pull request #2562 from MrPerson/only_the_dead_know_peace_from_this_evil 
Dead people no longer turn to face things when they examine.
 2014-02-02 16:39:50 -08: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
07e33da535 Merge pull request #2588 from Tenebrosity/windoor_consistent_attack_messages 
Standardises windoor attackby and hitby messages
 2014-02-02 16:19:54 -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
e60ecbb1f4 Merge pull request #2590 from GarrusVakarian/issue#2436fix 
Fixed issue #2436 (Classic baton stuns borgs)
 2014-02-02 16:08:45 -08:00
MrPerson
4ffd2cf5a4 Allow anyone whose living to turn on examine. 2014-02-02 15:07:09 -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
Cheridan
60576bc1a2 Merge pull request #2551 from Boggart/turretfix 
Fixes turret construction
turrets are the worst. i mean, jeez.
 2014-02-02 10:08:59 -08:00
Tkdrg
e74088cfe5 Adds book bags to the biogenerator, costing 200 biomass. 2014-02-02 15:04:10 -03: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
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