cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 02:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,503 Commits 61 Branches 14 Tags
84dcf0dd3fbb59485b87f7d8d8ccc37588b7b839
Commit Graph

15466 Commits

Author SHA1 Message Date
phil235
84dcf0dd3f dammit. 2016-04-30 12:33:12 +02:00
phil235
04018648d1 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixGib 
Conflicts:
	code/modules/mob/living/death.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2016-04-30 12:30:36 +02:00
KorPhaeron
1a18d00fe1 No more mindswapping with bosses 2016-04-30 02:22:43 -05:00
Jordie
53fd10c54b Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake 
Revert "Move some stuff from different layers to different planes"
 2016-04-30 15:34:17 +10:00
Nerd Lord
8a6d36061e Each cable coil color now has inhands 2016-04-29 22:10:11 -04:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes 
No longer deaf while inside pipes
 2016-04-29 20:34:03 -05:00
Cheridan
34dd0e5b02 Merge pull request #17018 from KorPhaeron/megafauna 
Megafauna
 2016-04-29 20:27:21 -05:00
KorPhaeron
5a09b7f8d9 Knocking sound 2016-04-29 19:43:22 -05:00
KorPhaeron
209a3d3e8e Legion is behind the door 2016-04-29 19:42:20 -05:00
KorPhaeron
eecd2942b3 Fixes dragon spamming explosion logs 2016-04-29 17:13:34 -05:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -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
2cc2341536 Fixes runtime when using gibself on an animal. 
Fixes gib animation never appearing for carbons.
gib() now has a "no_organs" argument to not spill organs on gib().
gib() also no longer waits for the gib animation to finish before actually qdeling the mob (which was causing the possibility of multi-gibbing animation during cult sacrifice.
Gibself no longer spill organs.
Simple_animal no longer show "X stops moving" when gibbed.
 2016-04-29 03:57:16 +02:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
phil235
d5af5ca696 Objects with invisibility = 101 are ignored by procs like view() that are used for say() and visible_message(). 
Objects that are simply hidden (instead of being abstract things) now always use invisibility = 100.
This fixes not being able to hear what you say while inside a hidden gas/disposal pipe.
Fixes the t-ray scanner revealing abstract object that should never be seen, like spacevine controller.
Fixes not hearing anything during a mob transformation.
 2016-04-29 00:04:40 +02: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
KorPhaeron
137da8bb57 Noise for drinking potion, GPS is abstract 2016-04-28 10:09:35 -05:00
KorPhaeron
ae989b2700 Death sound refactor, dragon fixes, dragon dead icons 2016-04-28 09:06:37 -05:00
Jack Edge
e01a74f8b8 Blend in with the others 2016-04-28 12:38:47 +01:00
KorPhaeron
75f92ae43f Pixel offset fix 2016-04-28 04:49:05 -05:00