cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 18:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,143 Commits 61 Branches 14 Tags
9fc02e0c9a5cc98c1d39ce30ffcd3c00a2d2659f
Commit Graph

556 Commits

Author SHA1 Message Date
Razharas
4aea0db29b Merge pull request #14120 from duncathan/listmos 
[READY] Listmos & "Datum Gases"
 2016-01-15 11:58:05 +03:00
duncathan salt
bcdb01caba Merge pull request #14557 from Buggy123/patch-1 
Graffiti no longer explicitly stated to be drawn with crayons.
 2016-01-14 17:04:02 -06:00
duncathan
9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
Nerd Lord
fed4212716 Updates guardian HUD button icons. 
Adds two new holoparasite colors, light purple and crimson.
Replaces silver in the possible holoparasite prefix list with platinum.
Updates descriptions for the guardian types traitors have access to.

Adds glow effects when guardians teleport or recall, including fire guardian teleporting and support guardian teleporting.
 2016-01-12 16:39:08 -05:00
Buggy123
692d3a6100 Fuck it just genericize the description. 2016-01-10 18:46:38 -05:00
Buggy123
18bab22f25 New spraypaint decal 2016-01-10 18:23:43 -05:00
Buggy123
ebb7e62edc Update crayon.dm 2016-01-10 02:54:22 -05:00
Buggy123
30ceab8c19 Spraypainted stuff no longer appears to be drawn with crayons. 2016-01-10 02:33:07 -05:00
tkdrg
24b7eaa23a Merge pull request #14488 from KorPhaeron/wall_layer 
Walls are a slightly higher layer than floors
 2016-01-09 18:41:59 -03:00
KorPhaeron
1d9b334e50 Fixes layers 2016-01-09 15:32:35 -06:00
duncathan salt
18b9d67ab5 Merge pull request #14364 from swankcookie/cockroach_guts_fix 
Cockroach guts fix
 2016-01-06 22:50:15 -06:00
swankcookie
98d4b9076d Moves contraband to a more fitting location 
Signed-off-by: swankcookie <__X__>
 2016-01-06 22:12:00 -06:00
swankcookie
d4c3048a31 Removes redundant anchor tags 
Signed-off-by: swankcookie <__X__>
 2016-01-06 22:08:17 -06:00
swankcookie
a7508350e5 Gives /cleanable.dm "anchored = 1" 2016-01-03 20:43:48 -06:00
MrStonedOne
b50e8d2a63 removes a bunch of unneeded spawns 
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
 2016-01-02 18:23:02 -08:00
duncathan
b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
 2016-01-02 18:02:54 -06:00
AnturK
032c8a4222 Adds nodrop to pickup chainsaw 2015-12-30 22:39:15 +01:00
duncathan
17f167bcb7 associative list 2015-12-29 13:33:12 -06:00
AnturK
0fb8ac18c3 Adds a few special mines/pickups 2015-12-29 00:20:57 +01:00
duncathan
a64b68f76c caches gases in more procs 2015-12-28 13:32:49 -06:00
duncathan
b18cb5fca8 making shit compile 2015-12-28 08:31:20 -06:00
tkdrg
ac7e0cc036 Merge pull request #13805 from KorPhaeron/stacking_decals 
Fixes decal stacking
 2015-12-26 10:07:18 -03:00
KorPhaeron
a47b490d2b That was dumb 2015-12-26 07:00:20 -06:00
KorPhaeron
1a958e83b6 Stacking decals 2015-12-26 06:47:07 -06:00
KorPhaeron
2f22514fd6 Spider fixes 2015-12-24 04:57:50 -06:00
KorPhaeron
6ad132df53 Stacking decals 2015-12-19 07:41:22 -06:00
KorPhaeron
d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Cheridan
45c06ae2cd Merge pull request #13555 from bgobandit/sexyhonk 
Buffs the sexy clown.
 2015-12-12 13:00:46 -06:00
KorPhaeron
44873907f4 More spider fixes 2015-12-11 04:42:04 -06:00
bgobandit
73471eb8b1 sexy clown is now a sexy object oriented clown 2015-12-10 19:19:03 -05:00
Cheridan
da3eba756d Merge pull request #13463 from Incoming5643/a_placebo_effect 
Adds glowcaps
 2015-12-08 22:08:25 -06:00
Incoming
7f3a1158d2 Adds glowcaps 
Glowcaps are red mutant glowshrooms. They can be used in all the same ways normal glowshrooms can, but they also boast a special feature.

When you finish eating a glowcap, the batteries of any electronics you have on/in you are recharged up to potency%.
 2015-12-05 03:35:23 -05:00
MrStonedOne
a1bfb37f0c Tweaks lighting some more. 
This should be ready to go.
 2015-12-02 07:12:37 -08:00
duncathan salt
aa7df92150 Merge pull request #13282 from Anonus/fluxfix 
Fixes flux and gravitational anomalies not shocking nondense mobs
 2015-11-29 12:35:30 -06:00
Nerd Lord
33e6fe073e Cross() isn't called anywhere even though it might be useful! workarounds! 2015-11-28 12:49:44 -05:00
Nerd Lord
98e3cdeabd Fixes flux and gravitational anomalies sometimes not shocking mobs. 2015-11-28 12:41:28 -05:00
Nerd Lord
1414070115 Cult theme update; 
Cult stuff uses cult span classes for the most part.
There are beams when using blood drain on a target and when reviving a target with the raise dead rune.
There's a nar-sie maw when you sac something, holy shit.
Sac invocation is now the old invocation, and it worked in testing I promise.
Updates construct descriptions to match what they tend to do.
There's like one or two bugfixes, you can examine talismans as a cultist without the paper menu popping up.
The supply talisman popup is like 50% smaller.
 2015-11-27 21:53:56 -05:00
Nerd Lord
9437d6fc27 BETTER workaround. 2015-11-18 15:21:04 -05:00
Nerd Lord
a183e0474d Pooling is good for the soul. 2015-11-17 11:27:26 -05:00
Nerd Lord
757d009e4f Constructs now have action buttons! 
Cult floors and walls now have a glow effect when spawning in.
Nar-Sie uses a span class just for it spawning. Get spook.
 2015-11-16 15:20:13 -05:00
Nerd Lord
e19757bca3 MY CODE QUALITY IS BASED ON WHAT I'M MESSING WITH 2015-11-11 15:20:48 -05:00
Nerd Lord
182f4ed16b Shaved a few lines off. 2015-11-11 14:57:02 -05:00
Nerd Lord
f8464b97ef Makes anomalies somewhat more dangerous; hyper-energetic flux anomaly will shock mobs that run into it(or if it runs into them), bluespace anomaly will occasionally teleport mobs away from it in a small radius, vortex anomalies will sometimes throw objects at nearby living mobs, and pyroclastic anomalies will produce MORE FIRE, MORE HEAT, MORE BURNING, and if not disabled, they will burst into flame and the resulting slime will be rabid and thus attack much more aggressively. 
Also fixes a bug where gravitational anomalies were doing if(!target) throw stuff instead of If(target) throw stuff, meaning it'd either do nothing or runtime.

In addition, anomalies move more often, are resistant to explosions and will only be destroyed if they are in devastation range(but why are you bombing it)
 2015-11-11 12:41:07 -05:00
Tkdrg
8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk 
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
 2015-11-07 15:56:39 -03:00
Nerd Lord
0f23809346 Revenant changes XVIII 
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
 2015-11-05 18:50:51 -05:00
Tkdrg
e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts 
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
 2015-11-02 01:06:30 -03:00
Cheridan
ed9b0c35c6 Merge pull request #12612 from phil235/BugFixBoogalooI 
bugfixes: bloodcrawl, losebreath, wintercoat, and more
 2015-10-25 14:19:11 -05:00
phil235
da84fcd8d2 - Fixes shadowling receiving burn messages even when dead. I've also fixed the same bug for other species and made certain spec_life() procs not run when the mob is dead. I also made slime species a subtype of jelly species since they had a lot of code in common thus reducing duplicate code. 
- Fixes odd behavior with emagging airlock and windoor animation.
- Fixes being able to bloodcrawl in oil decal.
- Fixes being deaf after bloodcrawling.
- Fixes wintercoat hood appearing below the mask.
- Fixes being able to attack another mob before the game has started (and other things which used a gamestart check that no longer works).
- Ghosts can no longer become drones before the game has started.
- Removed "bhunger" and "ajourn" mob vars, they are unused.
- Fixes admin-revived morph being invisible.
- Fixes heart attack stacking losebreath very high. Also now losebreath is reset to 0 when the mob dies.
- All mobs no longer have a default strip menu showing two hands.
 2015-10-23 20:00:52 +02:00
Nerd Lord
d05c81c2d9 This should resolve conflicts and not fail to compile woo woo 2015-10-22 22:10:29 -04:00
phil235
8751f9afb5 derp 2015-10-21 23:48:23 +02:00