cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-13 18:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 62 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

2293 Commits

Author SHA1 Message Date
phil235
34a3dcba9f Merge pull request #12879 from MrStonedOne/burnbabyburn 
Tweaks burn rate such that fires last longer but bombs are weaker.
 2015-11-25 14:10:50 +01:00
Menshin
bbbd4360d0 Fixes login runtimes for observers. 
Some failsafes for new_player login.
 2015-11-23 00:19:35 +01:00
KorPhaeron
c646656e79 Valid 2015-11-22 06:41:30 -06:00
Cheridan
4c899d2b34 Merge pull request #13063 from Incoming5643/subtypesof 
Adds subtypesof(path)
 2015-11-19 16:31:09 -06:00
Remie Richards
2c4676757c Adds a Synth Species, Admin only atm, Imitates a species and when they reach 50 HP their skin partially falls off. Adds a method for species to react to being force set by an admin. 2015-11-19 22:05:48 +00:00
Remie Richards
0710ce5def Merge pull request #13070 from octareenroon91/patch-30 
Introduce the four-color pen
 2015-11-19 18:42:26 +00:00
Remie Richards
7333bede43 Merge pull request #13055 from Anonus/actionbuttons 
Gives constructs action buttons, adds cool effects to cult turfs.
 2015-11-18 20:26:47 +00:00
Cheridan
cba8a9a325 Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix 
Conflicts:
	code/modules/mob/mob.dm
 2015-11-18 01:44:29 -06:00
as334
c98a7a0d7e Fixes merge conflicts, also a minor slipup with flags 2015-11-17 20:59:43 -05:00
Incoming
b12fc38946 A number of mixed nerfs and buffs to stunning spells: 
Lightning Bolt:
*You can no longer throw the bolt whenever you want, it will fire itself once it's done charging. Fixes #12849
*Getting hit by a bolt will do a flat 30 burn now, as opposed to scaling with how long you spent charging the spell. Unless you made a habit of charging lightning bolt to near maximum every time you cast it this is a buff.
*Every time the bolt jumps the next shock will do five less burn damage.
*Lightning bolts can still jump back to the same body, so the maximum number of bolts you can be hit by in a single casting is three, and the maximum amount of damage you could take for that is 60 burn.
*Stun time is unaffected

Magic Missile:
*Cooldown raised to 20 seconds, up from 15
*Cooldown reduction from taking the spell multiple times raised from 1.5 seconds to 3.5 seconds. Rank 5 magic missile now has a cooldown of 6 seconds, down from 9, and is effectively a permastun.

Time Stop:
*Time Stop field now persists for 10 seconds, up from 9
*Cooldown raised to 50 seconds, up from 40
*Cooldown reduction from taking the spell multiple times raised from  7.75 seconds to 10 seconds. Rank 5 time stop now has a cooldown of 10 seconds, up from 9, and is effectively a permastun.
 2015-11-17 19:04:38 -05:00
octareenroon91
a33df9b39b Make four-color pen available through cargo 
Adds two of /obj/item/weapon/pen/fourcolor to the Bureaucracy crate.
 2015-11-16 21:32:13 -06:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path. 
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
 2015-11-16 18:55:57 -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
duncathan salt
3860981936 Merge pull request #13025 from tkdrg/imdumb 
Improves antag_hud transfer_to() logic
 2015-11-15 15:59:51 -06:00
duncathan salt
31e30ab768 Merge pull request #12955 from CosmicScientist/FixingThePast 
Makes the dehydrated carp less ambiguous and decreases its TC cost
 2015-11-14 23:42:58 -06:00
Tkdrg
459619594f Improves antag_hud transfer_to() logic 
Fixes #13019
Fixes #11996
 2015-11-14 16:06:01 -03:00
TheNightingale
dca36b1723 * Elite Syndicate hardsuit added 
** Operative-only; fireproof, with bonus resistances
** Added to Operative uplinks
 2015-11-14 17:43:43 +00:00
as334
ef6af4ef5b Unfucking shit ass plasma memes part 1 2015-11-13 21:28:00 -05:00
as334
a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug. 2015-11-12 21:54:08 -05:00
francinum
e0df93d2b8 Fixes #12970 2015-11-11 15:43:51 -05:00
duncathan salt
d5fd4440ea Merge pull request #12067 from AnturK/resequencing 
Changes to DNA Injectors
 2015-11-11 10:50:30 -06:00
duncathan salt
0769ba5c00 Merge pull request #12945 from torger597/master 
Adds a Syringe to the Uplink Poison/Chemical kit
 2015-11-11 10:47:40 -06:00
duncathan salt
40cf13e575 Merge pull request #12942 from AnturK/mindfu 
Fixes mind swap kicking out the victim client
 2015-11-11 10:46:38 -06:00
AnturK
d82010caf3 Makes injectors timed 
Update
Lowers the scanner buffer transfer radiation.
Makes injector duration scale with upgrades.
Time coefficent values
 2015-11-11 17:27:55 +01:00
phil235
79d25ef2d9 Fixes remotely detonating planted c4 with signaler. 
Move CanUseTopic() procs to the correct files.
 2015-11-11 15:57:05 +01:00
CosmicScientist
1369b84782 That may find a place in this world. 2015-11-11 01:02:39 +00:00
CosmicScientist
d0e5bf65a7 And hope that something stronger grows there. 2015-11-11 00:02:40 +00:00
CosmicScientist
af74475cad Because I cannot bear it. 2015-11-10 23:41:59 +00:00
Torger597
cbdc72272b Edit 
Changed description of the kit itself to comment on the fact it now
comes with a syringe, added a change log entry for the change itself.
 2015-11-09 20:55:01 -06:00
AnturK
6e32dd4197 Fixes mind swap kicking out the victim client 2015-11-09 22:03:47 +01:00
AndrewJacksonThe2nd
eaa1d11af4 On stun_nerf: objectives 2015-11-08 21:10:21 -08:00
Nerd Lord
97697bcac4 Makes the lich beam dark green, and thus much more spooky. 2015-11-08 20:31:54 -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
Tkdrg
d966c37c6a Hand of God Fixes/Tweaks 
Fixes healing fountain construction sprite.
Nexus are now destroyed properly.
Borged cultists will now lose antag status properly.
Round end message fixed.
Feedback messages improved to be clearer, and lots of typos fixed.
Smite no longer uses up faith if there is no valid target in the turf.
Adds an atom/attack_god() proc.
Fixes the greeting messages for prophets and followers, improves god msg.
Fixes nexus being spawned on dense turf after 2min, and general sanity.
Fixes attacking structures with abstract items.
Adds click delay and attack animation for attacking structures.
Fixes a lot more typos.
Fixes defense pylon friendly fire.
Makes defense pylon togglable on its god's click.
Cleans up gun_turret code a little in general.
Adds deconversion by loyalty implant or holy water (basically rev+cult).
Gods will now die when they have no followers left.
Adds the HoG gods to the traitor panel.
 2015-11-07 15:25:28 -03:00
Razharas
6517a1450a Merge pull request #12865 from Incoming5643/wow_rational_thinking_at_not_3_am_is_powerful 
Adds a few checks in beam code to make it compatible with turfs
 2015-11-07 06:36:07 +03:00
Razharas
25f36bd158 Merge pull request #12869 from Menshin/clean_ghost_hud 
Made new_player mobs use the base Login() proc
 2015-11-07 06:35:52 +03:00
Razharas
5b1a2836fa Merge pull request #12772 from Xhuis/shadowling_update_5 
Shadowling Update V
 2015-11-07 06:11:39 +03:00
MrStonedOne
7410fb89be Tweaks burn rate. 
This will result in longer fires and less explody TTV bombs.

God help us all.
 2015-11-06 04:46:34 -08:00
Menshin
d1337fa009 New_player mob now uses generic Login() proc 2015-11-05 23:50:42 +01:00
Incoming
522731c977 Adds a few checks in beam code to make it compatible with turfs. 
Also acts a little check to see if both points of the beam are turfs, and if so, to not bother checking to see if the turfs are moving.
 2015-11-04 22:12:13 -05:00
Remie Richards
15bf91049e Improves Beam() code, Adds a new spacevine mutation+mob 2015-11-02 11:35:22 +00: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
AnturK
150c25b810 Shapeshift Spell 2015-11-02 00:28:58 +01:00
Xhuis
7d2eb5ddf2 Changes spell sound mechanics 2015-10-31 23:27:27 -04:00
Xhuis
55021fc27d Conflicts 2/2 2015-10-31 11:32:12 -04:00
Xhuis
f2291a1194 Shadowling update 5 2015-10-31 11:30:29 -04:00
Razharas
75b5b4b362 Merge pull request #12751 from Incoming5643/ok_it_was_OP_I_admit_it 
Lichmode lukewarm fix
 2015-10-31 15:07:38 +03:00
Incoming
a07c40c262 Swaps the last bit of the lichmode Beam() relying on something other than a turf for a turf. 
I was being dumb and tied an atom defined proc to a body set to be dusted instead of a turf that will surely exist in some form.
 2015-10-30 01:59:27 -04:00
Incoming
e2ba9d4e5b Swaps the last bit of the lichmode Beam() relying on something other than a turf for a turf. 
I was being dumb and tied an atom defined proc to a body set to be dusted instead of a turf that will surely exist in some form.
 2015-10-30 01:52:53 -04:00
Razharas
fc0ea9311b Merge pull request #12614 from GunHog/Diag_Huds 
Diagnostic HUDs
 2015-10-30 06:25:48 +03:00