cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,068 Commits 61 Branches 14 Tags
37ac44e9d64fbed86cdfb1e8e4e0b2c4ac69294e
Commit Graph

11776 Commits

Author SHA1 Message Date
Aranclanos
37ac44e9d6 Merge pull request #12985 from tkdrg/fuckme 
Fixes posibrain ghost alert
 2015-11-15 03:57:59 -03:00
Aranclanos
b1b5e73907 Merge pull request #13018 from Cheridan/my_b 
Fixes warning in anomaly_pyro.dm
 2015-11-15 03:36:02 -03:00
Razharas
62cd83fa30 Merge pull request #12778 from AnturK/minor_upgrades 
Mech Speech Bubbles, POI list for Observe
 2015-11-15 09:07:21 +03:00
duncathan salt
328c9537e7 Merge pull request #13013 from tkdrg/bugs 
Logging improvements
 2015-11-14 23:45:45 -06:00
duncathan salt
a2a3a471c7 Merge pull request #13000 from hornygranny/master 
wastes a get
 2015-11-14 23:44:20 -06:00
duncathan salt
f26a4fa106 Merge pull request #12992 from phil235/ProjectileSuicideFixes 
Fixes your shield blocking the bullets when committing suicide with a
 2015-11-14 23:43:55 -06:00
Remie Richards
ff26ef3fff Merge pull request #13009 from MrStonedOne/patch-62 
[Ready] Fixes map loader incorrectly detecting x size in maps
 2015-11-15 01:20:04 +00:00
Cheridan
d7bf779f2d Fixes warning in anomaly_pyro.dm 2015-11-14 00:23:05 -06:00
Jordie
bc71a9264a Merge pull request #13008 from Razharas/SpaceTransFix 
Makes space transition code fast and beautiful
 2015-11-14 17:12:22 +11:00
Cheridan
894784acab Merge pull request #12967 from Anonus/burnbabyburn 
Makes anomalies more dangerous
 2015-11-13 22:23:34 -06:00
Tkdrg
021b99badb Logging improvements 
Fixes SMES deconstruction logging.
Radiation will no longer message admins unless a living mob is hit.
All rad pulses will still be saved to logs.
Also adds a JMP link to the rad pulse message.

Fixes #12442
Fixes #12609
 2015-11-13 18:08:23 -03:00
Kyle Spier-Swenson
27aad8a3bc fucking Lummox JR's map loader treating chars and tiles as one 2015-11-13 10:22:52 -08:00
Kyle Spier-Swenson
ca7c087d48 Fixes map loader incorrectly detecting x size in maps 2015-11-13 02:32:28 -08:00
Razharas
a3bd89210a Shaves off 1568 iterations 
Shaves off 1568 iterations
 2015-11-13 10:57:42 +03:00
Razharas
8e38bb4b48 Makes space transition code fast and beautiful 
Makes space transition code fast and beautiful
No more looping through all turfs in the world
520200 (255*255*8) iterations -> 57120(255*7*4*8) iterations
Almost 10 times faster, and less code too!
 2015-11-13 10:31:34 +03:00
duncathan salt
67ae63161f Merge pull request #12938 from KorPhaeron/emitters 
Allows you to var edit emitter projectiles
 2015-11-13 00:16:11 -06:00
hornygranny
b5e12f9faf wastes a get 
wastes a get
 2015-11-12 19:45:06 -08:00
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
phil235
e20e03562a Fixes your shield blocking the bullets when committing suicide with a gun. 
Merged kill_count and range var into one var/range for obj/item/projectile.
Simplified projectile/proc/Range().
Fixes timestoped projectiles still calling Range() and thus being deleted despite being stopped.
Fixes projectile being invisible when on the first tile in front of the shooter (which meant no sprite showing when shooting a target 1 tile away)
Simplifies kinetic/Range()
 2015-11-12 19:45:50 +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
Tkdrg
fdccdb6ab9 Fixes posibrain ghost alert 
Yes, I did put the args in the wrong order. Kill me.
 2015-11-12 02:30:51 -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
Nerd Lord
e19757bca3 MY CODE QUALITY IS BASED ON WHAT I'M MESSING WITH 2015-11-11 15:20:48 -05:00
Cheridan
3a62235415 Merge pull request #12791 from KorPhaeron/removelizardremovelizard 
Human only ERT and Deathsquad
 2015-11-11 13:20:49 -06: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
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
duncathan salt
8bb0043ec7 Merge pull request #12939 from KorPhaeron/really_bad_ideas 
Adds a series of ridiculous weapons to the wizard spellbook
 2015-11-11 10:47:04 -06:00
duncathan salt
914786b0f6 Merge pull request #12921 from lordpidey/lordpidey_salgluBlood 
Saline-Glucose IV drip blood replacement.
 2015-11-11 10:46:21 -06:00
phil235
3fc3d93744 Merge pull request #12940 from Shadowlight213/emotebanfix 
Makes emote bans actually work
 2015-11-11 17:35:19 +01:00
phil235
5e43d2b570 Merge pull request #12924 from Firecage/Optable 
Changes the operating table to be an actual table.
 2015-11-11 17:31:38 +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
b0c2e3e9c8 Merge pull request #12793 from PKPenguin321/patch-2 
Adds surgery to remove surgically attached chainsaws
 2015-11-10 23:25:51 -06:00
duncathan salt
6de0264007 Merge pull request #12892 from tkdrg/fokkenhuds 
Ghost HUD tweaks
 2015-11-10 23:12:42 -06:00
duncathan salt
0761e69856 Merge pull request #12946 from tkdrg/red_deity 
Red deity fix
 2015-11-10 23:07:07 -06:00
Tkdrg
540b1cc076 Fixes adjust_fire_stack to work with macro Clamp() 
Fixes #12952
 2015-11-11 01:54:14 -03:00
Cheridan
44cca62727 Merge pull request #12805 from KorPhaeron/xray 
Xray range tweak
 2015-11-10 18:14:47 -06: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
Remie Richards
498cc918d5 Merge pull request #12944 from MrStonedOne/smartfridgerealfix 
Fixes smartfridges once and for all.
 2015-11-10 19:49:38 +00:00
Firecage
9ce5334890 merge conflict fix 2015-11-10 18:44:10 +02:00