cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-29 10:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,449 Commits 61 Branches 14 Tags
4bbdeaa9fa91fa2a2c6fde4f6f6eb349cd6703ab
Commit Graph

15430 Commits

Author SHA1 Message Date
Cheridan
4bbdeaa9fa Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers 2016-04-29 17:06:53 -05:00
KorPhaeron
7c1c35e6d8 Merge pull request #17250 from tgstation/duncathan-patch-1 
this should deal with those pesky atmos runtimes
 2016-04-29 15:38:25 -05:00
duncathan salt
c3b91d6e86 fixes #17248 2016-04-29 13:32:35 -06:00
phil235
7900f80544 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge 
Conflicts:
	code/game/objects/structures/aliens.dm
 2016-04-29 20:58:02 +02:00
Cheridan
48924d957e Merge pull request #17107 from Core0verload/botany_nerf 
Nerfs botany Potency gene extraction
 2016-04-29 13:38:36 -05:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205) 
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
 2016-04-29 20:29:20 +02:00
Cheridan
1e0c5acd1f Merge pull request #17211 from phil235/FixThermiteBorg 
Fix bundle: borg module, thermite, chairs
 2016-04-29 13:22:50 -05:00
Mercenaryblue
7601144eb7 Paper Planes Mk2 (#17058) 
Adds Paper Planes
 2016-04-29 19:17:36 +02:00
Razharas
ae78dd582a Merge pull request #17208 from phil235/FixMechaMaskToxin 
Fix bundle and mech melee attack animation
 2016-04-29 19:32:38 +03:00
KorPhaeron
29baead8a5 Merge pull request #17165 from Incoming5643/no_cat_cucks 
Fixes? Catsploision? [Maybe?]
 2016-04-29 11:18:24 -05:00
Razharas
d8232cbf33 Revert "Adds player preference to hide irrelevant tablecraft recipes" 2016-04-29 17:47:31 +03:00
Remie Richards
ddb1dacb0c Merge pull request #17234 from tgstation/duncathan-patch-1 
Fixes superconduction runtimes
 2016-04-29 14:52:56 +01:00
KorPhaeron
b6bdc66e30 Merge pull request #17192 from Incoming5643/I_was_feeling_down_so_heres_some_magic 
Buffs the staff/wand of door creation
 2016-04-29 08:27:49 -05:00
Razharas
6f8b1bc295 Merge pull request #17124 from MrPerson/wrapped_up_nicely_with_a_bow 
Removes monkeycube and chocolate unwrapping
 2016-04-29 16:03:59 +03:00
Razharas
81dadcec5f Merge pull request #17086 from MrPerson/planes_on_a_snake 
Move some stuff from different layers to different planes
 2016-04-29 15:51:41 +03:00
Razharas
21e554187d Merge pull request #17056 from Bawhoppen/randomrebalances 
Some random TC price rebalances
 2016-04-29 15:44:02 +03:00
Razharas
4ddf6015d8 Merge pull request #17032 from Robustin/ThisEndsNow 
Ends the confusing inconsistency of power cable and CONDUCT weapons
 2016-04-29 15:34:25 +03:00
Razharas
7b49961371 Merge pull request #16978 from nullbear/tablecraft-tweak 
Adds player preference to hide irrelevant tablecraft recipes
 2016-04-29 15:26:14 +03:00
Razharas
ce966f72c3 Merge pull request #16953 from Core0verload/onehalf 
Adds a new derelict to space ruins
 2016-04-29 15:23:50 +03:00
Razharas
c986212ddb Merge pull request #16778 from Robustin/commitcommoncult 
The Cult Rises...
 2016-04-29 15:10:16 +03:00
duncathan salt
be3c64caeb Fixes superconduction runtimes 2016-04-29 02:48:52 -06:00
Cheridan
ed53cec0ed Merge pull request #17172 from Robustin/travelmode 
RIP TRAVEL MODE, ALL HAIL EVA MODE
 2016-04-29 00:17:38 -05:00
Cheridan
fbd16c77cd Merge pull request #16934 from Core0verload/cargo 
Changes to Stocks Console UI, cargo fixes
 2016-04-28 23:22:17 -05:00
Cheridan
6e27f01c94 Merge pull request #17185 from phil235/FixBundle48 
Fix Bundle: holosign creator, status procs, teleporter hub, timestop effect
 2016-04-28 22:11:29 -05:00
phil235
be57a223b5 Moves alien structure into the proper folder objs/structures/aliens.dm 
Removes incorrect comment about forcedodge projectile.
 2016-04-28 22:44:26 +02:00
Joan Lung
5a627c5b66 Merge pull request #17166 from coiax/cargo-crates-1 
New cargo crates to buy
 2016-04-28 16:33:50 -04:00
Jack Edge
b21bc9ad96 Die commas die 2016-04-28 21:24:30 +01:00
Jack Edge
70e59d729f Increases cargo shuttle time back to two minutes 2016-04-28 20:11:52 +01:00
TechnoAlchemist
e2a6dac71f Merge branch 'master' of https://github.com/tgstation/-tg-station into realkinkystuff 
fixes conflicts probably

# Conflicts:
#	icons/obj/items.dmi
 2016-04-28 12:03:31 -07:00
phil235
d3fa99e58b Fixes runtime when thermiting a wall 
Fixes not being able to put down a chair on a tile with a border window.
Fixes Borg module cycling not working when the first module is empty.
 2016-04-28 20:44:02 +02:00
Joan Lung
fd8942e70c Adds survival pod windows to the code 
* Adds survival pod windows to the code

* Light and dark pod flooring

* looks better
 2016-04-28 10:57:39 -06:00
phil235
b8164b7b92 * Add an attack animation for mech melee attack. 
* Fixes mech action button icon not updating whent the button is activated.
* Fixes internal tank action button icon not updating to off when we adjusted our masks out.
* Fixes mime/clown mask not updating their action button icon when adjusting. Fixes clown mask not updating
its on mob icon if adjusted when worn.
* Fixes typo in the human threshold for toxin in the air.
* Fixes changing the thermomachine circuitboard settings not giving any feedback.
 2016-04-28 18:56:14 +02:00
Razharas
daf01d872e Merge pull request #17157 from Core0verload/botany_nerf_II 
Nerfs botany slippery-everything
 2016-04-28 18:21:09 +03:00
Jack Edge
e01a74f8b8 Blend in with the others 2016-04-28 12:38:47 +01:00
Incoming5643
e9706a798d mineral doors are dumb 2016-04-27 22:15:25 -04:00
Incoming
5a77cefe2d humor me here I can't test locally right now 2016-04-27 22:07:14 -04:00
Robustin
b5952c94cc Merge branch 'master' of https://github.com/tgstation/-tg-station into commitcommoncult 
# Conflicts:
#	icons/obj/items.dmi
 2016-04-27 22:04:06 -04:00
Incoming
55b830f39d buffs the staff/wand of door creation: Doors created start open, it can also be used on airlocks to open them akin to the knock spell. 2016-04-27 21:44:53 -04:00
Joan Lung
cc59925d2e Merge pull request #17108 from Bawhoppen/sandbagsz 
Some sandbag changes
 2016-04-27 20:23:21 -04:00
MrPerson
b50e0ee42c Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake 2016-04-27 17:03:32 -07:00
Joan Lung
d9bc4e0040 Merge pull request #16914 from MrStonedOne/clientversionconfig 
Adds a config for client versions
 2016-04-27 19:29:11 -04:00
phil235
8a9422e45f derp, copypasta error 2016-04-28 00:24:50 +02:00
phil235
2ad8d4a392 * Fixes the holosign_creator's sign counter not going back up when one of its holosign is destroyed. 
* Fixes the lack of second argument in alien/stun()
* Fixes the sleeping alert not being updated properly when a mob asleep is killed then revived.
* Fixes timestop effect leaving mobs unable to move forever in some cases.
* Fixes teleporter hub and station staying active when the hub's panel is open, despite the hub's open panel sprite looking offline. The Hub and station now use their own iconfile icons/obj/machines/teleporter.dmi (similar what most machines have).

* I've moved all mob's status adjustment procs (Stun(), Paralyse(), blur_eyes() adjust_drugginess(), etc...) into specific files (named "status_procs.dm") so they're easier to find. I've added a third argument to stun adjustments procs to ignore the CANSTUN flag. I've also changed the weaken procs to have the ignore_canweaken argument be the third argument, so all status adjustment procs have amount as first arg, updating the mob or not as second, and when necessary an ignore_x as third arg.
 2016-04-28 00:13:15 +02:00
KorPhaeron
44b276859e Merge pull request #17140 from ChangelingRain/shaketheroom 
Charger holoparasites now shake the target's camera
 2016-04-27 13:24:54 -05:00
Incoming5643
f612c83c87 negates nullcats 2016-04-27 14:23:38 -04:00
Cheridan
eb7b0e528c Merge pull request #17097 from Shadowlight213/Jetpackimplant 
Fixes jetpack implant speed boost inconsistency.
 2016-04-27 13:13:28 -05:00
Robustin
201abb0323 GudChange 2016-04-27 14:01:57 -04:00
Cheridan
3a91fab55c Merge pull request #17163 from phil235/ImprinterFix 
Imprinter fix
 2016-04-27 12:41:16 -05:00
Jack Edge
6af0e2a0dc Cargo shuttle now arrives in 2 minutes 2016-04-27 17:35:34 +01:00
Joan Lung
ffc87184f0 You can now analyze blobs to check material effects, blob type, and health 
* You can now analyze blobs to check material effects, damage resistance, and health.

* beep beep

* slime extinguishes stuff

* I need to check my code

* wew

* buffnerfs

* fuckthemeta

* morebuffs

* no unfriendly fire

* damn my urge for low linecounts

* this makes me want to drink heavily

* if you see something, say nothing, and drink to forget

* waiting for an answer is for scrubs

* if you see something say nothing and drink to forget

* no resist printout

* phiiiiiiiil
 2016-04-27 10:24:47 -05:00