cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,010 Commits 61 Branches 14 Tags
ca7c087d48edda16b8ec08c751854dcb7fd55f21
Commit Graph

5386 Commits

Author SHA1 Message Date
as334
d39982e98a Small tweak for Cheridan 2015-11-12 22:09:26 -05:00
as334
a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug. 2015-11-12 21:54:08 -05:00
phil235
5268a2613f Merge pull request #12994 from phil235/ReagentObfuscation2 
Reagent obfuscation (copy)
 2015-11-12 23:25:55 +01:00
Xhuis
e02831d5b1 Reagents can no longer be determined by examining a reagent container without the proper apparatus. Silicons and ghosts can always see reagents. 
Science goggles now allow reagents to be seen on examine. In addition, chemists now start wearing them. The bartender has a pair that looks and functions like sunglasses.
 2015-11-12 23:01:33 +01:00
duncathan salt
df6ac90baa Revert "Revert "Merge pull request #12067 from AnturK/resequencing"" 2015-11-12 15:25:31 -06:00
phil235
9e3b7610ff Merge pull request #12959 from tkdrg/abranch 
Fixes adjust_fire_stack to work with macro Clamp()
 2015-11-12 20:15:06 +01:00
Razharas
3992858ed1 Revert "Merge pull request #12067 from AnturK/resequencing" 
This reverts commit d5fd4440ea, reversing
changes made to 605710d0ec.

Reverting this bullshit
 2015-11-12 21:11:50 +03:00
duncathan salt
4fcdc7d748 Merge pull request #12950 from phil235/AIMechStunFix 
Fixes flashbanged mmis in mechs losing access to most mech functions
 2015-11-11 16:34:24 -06:00
duncathan salt
b1d1ecb81f Merge pull request #12904 from Incoming5643/action_action_action_action_action 
Adds action buttons for slimes
 2015-11-11 15:21:05 -06:00
Incoming5643
5c5c24380e ayy 2015-11-11 16:04:05 -05:00
Incoming
d8a0dc6b54 jumps through hoops to save two lines 
adds slime growth as a define
 2015-11-11 16:00:38 -05:00
as334
6a2c3b3fb1 Adds sprites for the most part. 2015-11-11 15:44:59 -05:00
duncathan salt
20c37465eb Merge pull request #12765 from GunHog/Removes-Android-Split-Personality 
Posibrain possession fix
 2015-11-11 11:02:49 -06:00
duncathan salt
d5fd4440ea Merge pull request #12067 from AnturK/resequencing 
Changes to DNA Injectors
 2015-11-11 10:50:30 -06:00
phil235
3fc3d93744 Merge pull request #12940 from Shadowlight213/emotebanfix 
Makes emote bans actually work
 2015-11-11 17:35:19 +01: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
duncathan salt
6de0264007 Merge pull request #12892 from tkdrg/fokkenhuds 
Ghost HUD tweaks
 2015-11-10 23:12:42 -06:00
Tkdrg
540b1cc076 Fixes adjust_fire_stack to work with macro Clamp() 
Fixes #12952
 2015-11-11 01:54:14 -03:00
Incoming
3da00354b4 Merge branch 'master' of https://github.com/tgstation/-tg-station into action_action_action_action_action 
Conflicts:
	icons/mob/actions.dmi
 2015-11-10 17:03:05 -05:00
phil235
db67825974 Fixes being able to stun AI and MMI forever with flashbang, preventing them from using their mech. Brain mobs can no longer get flashed or flashbanged. Silicons are no longer affected by the sound bang of the flashbang (since they have no ears). 
Fixes a runtime with two blob reagents.
Fixes a reference not being removed when hydro tray is destroyed.
Laser pointer can no longer weaken AIs (no eyes).
 2015-11-10 22:06:54 +01:00
Razharas
b4a9281a94 Merge pull request #12933 from Anonus/spookyscary 
Revenant bugfixing
 2015-11-10 07:52:58 +03:00
Cheridan
30550a5d1f Merge pull request #12918 from duncathan/alwaysreturnparentplease 
Makes cows, goats, and udders return ..() in Destroy()
 2015-11-09 13:34:56 -06:00
Shadowlight213
3290a998fa Makes emote bans actually work 2015-11-09 10:47:44 -08:00
Aranclanos
d454eae1b1 Merge pull request #12916 from tkdrg/ripinpiss 
Removes PDA chatrooms
 2015-11-09 02:56:41 -03:00
Jordie
eadbfc9b1c Merge pull request #12915 from Shadowlight213/emoteban 
Adds emote bans
 2015-11-09 15:47:35 +11:00
Nerd Lord
d311183782 Fixes #12932 
Also makes revenants use an update icon proc to update the icon based on what it's currently doing.
Also fixes a bug where using an ability could potentially lower your stun and reveal times.
 2015-11-08 22:44:36 -05:00
Tkdrg
88f64c607e Ghost HUD tweaks 
Removes links in tooltips. Makes alerts work as clicks when applicable.

Fixes #12843
Fixes #12844
 2015-11-08 22:53:41 -03:00
Cheridan
8cd8d259ee Merge pull request #11803 from RemieRichards/HandOfGod-Resurgence 
Hand of God: Resurgence
 2015-11-08 14:09:42 -06:00
duncathan salt
0b75cd7bbd makes milk-producers return properly in Destroy() 2015-11-08 00:35:51 -06:00
Tkdrg
20fe2e4bb5 Removes PDA chatrooms 
Nobody used them, and they were cluttering PDA Topic() needlessly.
Rest in peace, my child. You were too good for this world.
 2015-11-07 23:51:48 -03:00
Shadowlight213
9fe0bdf583 Adds emote bans. 2015-11-07 18:32:35 -08:00
Cheridan
09a506ef0f Merge pull request #12877 from KorPhaeron/insert_tf2_joke 
Allows golems to wear hats
 2015-11-07 14:33:00 -06:00
Incoming
284ad97289 Merge branch 'master' of https://github.com/tgstation/-tg-station into action_action_action_action_action 
Conflicts:
	icons/mob/actions.dmi
 2015-11-07 14:30:31 -05:00
Incoming
a88b5d797c *adds action buttons for slimes 
*technically obsoletes the slime tab, but I left it in just in case anyone prefers it.
 2015-11-07 14:24:48 -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
af411525dc Merge pull request #12841 from KorPhaeron/ui 
Swaps Guardian HUD button locations
 2015-11-07 08:06:42 +03:00
Razharas
3553509936 Merge pull request #12855 from AnturK/abdfix 
Fixes advanced camera resets.
 2015-11-07 08:06:11 +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
01f50fe4ff Merge pull request #12861 from phil235/FixGibMorph 
Fixes gibbed morph not dropping items.
 2015-11-07 06:09:20 +03:00
Razharas
13b7de40e9 Merge pull request #12842 from Jalleo/Lifecleanup 
Cleans up copy pasted…
 2015-11-07 06:08:46 +03:00
Razharas
5e9ef18dad Merge pull request #12868 from phil235/BloodcrawlSlimeBugFix 
Fixes slimes not being detached from their victim when the victim starts bloodcrawling.
 2015-11-07 06:07:57 +03:00
Razharas
5e736281a7 Merge pull request #12871 from YotaXP/origin_tech_fix 
Fixed bad `origin_tech` values.
 2015-11-07 06:06:48 +03:00
Razharas
0066670421 Merge pull request #12872 from Anonus/gtfoghost 
Revenant Changes XVIII: You'd better be afraid of the ghost
 2015-11-07 04:27:52 +03:00
Razharas
4892c79a0d Merge pull request #12862 from Robustin/master 
Slows down nutrition loss in Slime People
 2015-11-06 19:44:31 +03:00
KorPhaeron
4e85f49d8a Hats 2015-11-06 01:54:14 -06:00
Nerd Lord
3f3994f549 Overload lights no longer shocks through walls. 2015-11-05 20:36:04 -05: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
Menshin
d1337fa009 New_player mob now uses generic Login() proc 2015-11-05 23:50:42 +01:00
YotaXP
2ffc5f055c Fixed bad origin_tech values. 2015-11-05 15:32:25 -05:00