cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 01:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,598 Commits 61 Branches 14 Tags
3eeb0cb8e92fbf6ce770ec91d40fbd511ffd4453
Commit Graph

6878 Commits

Author SHA1 Message Date
MMMiracles
a72e48ffe3 the fact this never came up is surprising 2016-05-01 12:20:06 -04:00
Joan Lung
72f25a53e6 Merge pull request #17277 from KorPhaeron/cyborg_buffs2 
Cyborg Blueprints
 2016-05-01 11:05:48 -04:00
Cheridan
70d1ecfb68 Fixing conflicts 2016-05-01 04:11:21 -05:00
Cheridan
3981f27e3d Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers 
Conflicts:
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
	icons/mob/animal.dmi
	icons/mob/mob.dmi
 2016-05-01 04:06:26 -05:00
Cheridan
0a45f89bdc Finishes scavengers 2016-05-01 03:51:25 -05:00
Jordie
d0dcd62e87 Merge pull request #17268 from Core0verload/grubgrub 
Goldgrub no longer can burrow into the station floor
 2016-05-01 17:50:09 +10:00
Jordie
265938e7d9 Merge pull request #17220 from Incoming5643/badmins_doing_shit 
View vars will now tell you if something has been previously var edited
 2016-05-01 17:02:02 +10:00
Jordie
98655ac6e8 Merge pull request #17219 from TrustyGun/lavaland_cuisine 
Adds Stuffed Legion
 2016-05-01 16:59:11 +10:00
Jordie
f3f0c63e4f Merge pull request #17245 from nullbear/c4-path 
Changes C4 Path and adds X4 breaching charge
 2016-05-01 16:41:07 +10:00
Joan Lung
43ada53037 Merge pull request #17272 from KorPhaeron/dragon 
Fixes Dragon Explosion Log Spam
 2016-04-30 15:04:54 -04:00
Cheridan
55514c3be6 Merge pull request #17233 from coiax/mining-item-stats 
Added more stat tracking to mining items and engine generation
 2016-04-30 08:21:41 -05:00
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
TrustyGun
9feb71f7a6 move legion skull to mining.dmi 2016-04-30 06:03:12 -04:00
TrustyGun
837739df65 Merge branch 'master' of https://github.com/tgstation/-tg-station into lavaland_cuisine 2016-04-30 05:52:50 -04:00
KorPhaeron
946fac13dd Cyborg Blueprints 2016-04-30 03:47:51 -05:00
KorPhaeron
f4f6a64a1c Fixes Dragon Log Spam 2016-04-30 02:03:30 -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
c0
2a8faf099b Goldgrub no longer can burrow into the station floor 2016-04-30 07:12:02 +03: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
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
Cheridan
4bbdeaa9fa Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers 2016-04-29 17:06:53 -05:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -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
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
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
c986212ddb Merge pull request #16778 from Robustin/commitcommoncult 
The Cult Rises...
 2016-04-29 15:10:16 +03:00
nullbear
5cd0cca621 Adds more reuseable c4 type path. Adds x4. Fixes chembomb recipe. 2016-04-29 03:31:17 -07:00
Jack Edge
fd8f0e425f Added statistics to mining and lavaland 2016-04-29 09:40:12 +01:00
Incoming
2fe5f2bb2c Fixes the dumbest conflict I have ever seen 2016-04-29 00:19:26 -04: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
Incoming
10b966b97c View vars will now tell you if something's been previously var edited 2016-04-28 19:38:21 -04:00
TrustyGun
0a23bba7d8 removes attack_by, adds more saline glucose solution to make it worthwile 2016-04-28 19:33:38 -04:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
TrustyGun
8d27540bfa adds stuffed legion 2016-04-28 18:59:34 -04: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
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
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
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
KorPhaeron
75f92ae43f Pixel offset fix 2016-04-28 04:49:05 -05:00
KorPhaeron
54213b51b7 Dragon Layer Fix 2016-04-28 04:44:47 -05:00
KorPhaeron
9bc3b65c38 Updates goliath hide path 2016-04-28 04:22:19 -05:00
KorPhaeron
f572ae0b88 Merge remote-tracking branch 'refs/remotes/tgstation/master' into megafauna 2016-04-28 04:21:09 -05:00