cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-27 10:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,458 Commits 59 Branches 14 Tags
7c0c66dba3183ed4092f59eb70f9fc03f64f1b36
Commit Graph

24358 Commits

Author SHA1 Message Date
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
AnturK
ea2f57e6d2 Merge pull request #15523 from optimumtact/extreme_makeover_turret_edition 
Rearrange turret files to split out functionality
 2016-02-17 11:34:02 +01:00
Cheridan
c1a1e90ca7 Merge pull request #15536 from optimumtact/spidersspiderseverywhere 
Don't allow every single spider to be player controllable
 2016-02-16 15:47:15 -06:00
Cheridan
aa8de1bb51 Merge pull request #15554 from Menshin/autolathe_stacks_fix 
Fix autolathe merging on top stacks without checking for types
 2016-02-16 13:22:23 -06:00
Cheridan
073817b0ba Merge pull request #15538 from phil235/SpawnAtomFix 
Fixes spawn_atom() runtime.
 2016-02-16 03:51:12 -06:00
AnturK
7ede85391f Merge pull request #15527 from phil235/ReviveFixes 
Fixes blindness overlay after reviving.
 2016-02-15 23:17:55 +01:00
oranges
f2d4a60c74 Fix a lot of issues as pointed out by review 
Update the defines to be the correct syntax
 2016-02-16 10:50:38 +13:00
oranges
913d46f32d Remove old workaround check 
This looks to be a check from before nodrop functionality to prevent robots using their gun on the turret
 2016-02-16 10:05:32 +13:00
oranges
0dd89d484a Rearrange turret files to split out functionality 
Add defines for the turret construction phases

Tweak syndicate turret targeting to remove uncessary faction check
 2016-02-16 10:05:32 +13:00
oranges
b496ca6043 Don't allow every single spider to be player controllable 2016-02-16 10:00:23 +13:00
tkdrg
10abc21c2c Merge pull request #15525 from AnturK/reliable_fix 
Basic reliability fix
 2016-02-15 16:44:58 -03:00
Menshin
8b5ffe4779 Fix autolathe merging stacks without checking for types. 2016-02-15 20:44:28 +01:00
tkdrg
2a4a5a42f4 Merge pull request #15522 from optimumtact/unholyspawns 
Refactor out a spawn in turret code
 2016-02-15 16:39:49 -03:00
tkdrg
80301881de Merge pull request #15515 from MrStonedOne/patch-154 
attempts to solve minimaps crashing the server. (again)
 2016-02-15 16:32:32 -03:00
KorPhaeron
9cec5f51a2 Merge pull request #15546 from octareenroon91/patch-31 
Correct generic chem patch icon
 2016-02-15 05:23:46 -06:00
oranges
f5812bbd47 Refactor out a spawn in turret code 
Also avoids checking the emagged var twice when shooting a projectile
 2016-02-15 23:25:02 +13:00
octareenroon91
e51d602ca6 Correct generic chem patch icon 
Fixes #15540
 2016-02-15 01:15:37 -06:00
Remie Richards
e8426a26da Merge pull request #15505 from ChangelingRain/sleeplesscarp 
Sleeping carp gang no longer has special equipment
 2016-02-15 03:05:04 +00:00
tkdrg
a2d61685bb Merge pull request #15508 from PKPenguin321/patch-13 
Lowers cost of traitor surgery bag
 2016-02-14 23:21:52 -03:00
tkdrg
f2fc954846 Merge pull request #15511 from francinum/patch-2 
Normalized capitalization.
 2016-02-14 23:14:16 -03:00
Incoming
57c9c08bef Merge branch 'master' of https://github.com/tgstation/-tg-station into I_dont_know_why_Im_doing_this_but_its_not_your_job_to_stop_me 
# Conflicts:
#	code/modules/mob/living/simple_animal/parrot.dm
 2016-02-14 17:57:03 -05:00
phil235
4aca9a1529 Fixes spawn_atom() runtime. 2016-02-14 23:49:25 +01:00
Incoming5643
4d199e699d adds speech_shuffle_rate as a var 
speech_shuffle_rate will also raise when poly is fed a cracker to help cut down on line repetition
 2016-02-14 17:46:15 -05:00
tkdrg
9e74538509 Merge pull request #15490 from octareenroon91/patch-37 
Parrot-Cracker Balance
 2016-02-14 19:41:31 -03:00
Incoming5643
431421b2f2 Take cares of minor suggested code tweaks 2016-02-14 17:17:41 -05:00
octareenroon91
610f2b47ba Now requires 20 crackers to go from 1% to 100% speak_chance. 2016-02-14 15:34:07 -06:00
tkdrg
449c20ec74 Merge pull request #15497 from AnturK/scrub 
Fixes scrubbers/vents showing pipes over flooring
 2016-02-14 17:13:05 -03:00
tkdrg
c26de00dae Merge pull request #15499 from neersighted/readmin 
Fix and refactor deadmin/readmin
 2016-02-14 17:08:13 -03:00
phil235
961331d00a Fixes ethereal jaunt not updating your perspective at the end. 2016-02-14 19:29:34 +01:00
AnturK
46597f41f6 Bit more flat 2016-02-14 17:39:44 +01:00
duncathan salt
be3b993465 Merge pull request #15218 from MrStonedOne/patch-144 
[ready]Speed up process_cell() by caching atmos_adjacent_turfs as a list of nearby turfs and not a bitflag so we can avoid doing a bunch of turf lookups 4 times for each turf in atmos
 2016-02-14 10:34:02 -06:00
tkdrg
911e1b2b21 Merge pull request #15496 from phil235/FinalBorgStunFix 
Fixes runtime when borg try to reduce its weakened var.
 2016-02-14 12:50:05 -03:00
tkdrg
579ff5ea37 Merge pull request #14894 from MrStonedOne/patch-131 
Partial revert of 14756 (Pipes don't transport air across time and space
 2016-02-14 12:22:56 -03:00
phil235
ff371a5ea3 Let's not remove the mob from dead mob list if we're not actually reviving them. woops 2016-02-14 15:32:22 +01:00
phil235
e3bbcb0f7f Fixes revive() not properly removing the blind overlay. (fixes staff of healing) 
Fixes revive() working on brainless carbons, making them die right away. It now only heals the body but doesn't actually make the mob alive again.
Fixes dead mob put into closet and then revived not seeing the closet vision overlay.
Fixes brain mob's emp_damage never decreasing when stat == DEAD.
Fixes posibrain's brainmob starting dead.
Fixes ai fixing not clearing the blind overlay properly.
Fireball projectile no longer explodes on the firer when there's a body on their tile. The fireball's range() code now only checks the two tiles on its front left and front right for mobs to hit.
Remove some update_vision_overlays() (now unused) that I forgot to remove.
Using a staff oh healing on a corpse with a damaged brain organ will revive the mob and heal the brain organ.
 2016-02-14 15:26:46 +01:00
AnturK
3ec50ed2cf Simple reliability fix 2016-02-14 12:12:36 +01:00
MrStonedOne
a2ae265064 Brings the rest of atmos into the new turf list system (and some more speed ups for process_cell()) 2016-02-14 00:07:43 -08:00
francinum
854f0e3171 Fixes the rest in BuildAndRepair 2016-02-14 02:12:43 -05:00
oranges
1653df9e51 Make sure function is defined before overriding it 2016-02-14 19:43:52 +13:00
Kyle Spier-Swenson
efde9a7e3b compile error fix 2016-02-13 22:41:17 -08:00
Kyle Spier-Swenson
cd9c7e9b6f Update LINDA_turf_tile.dm 2016-02-13 22:41:16 -08:00
Kyle Spier-Swenson
15e080bc07 Makes atmos treat atmos_adjacent_turfs as a list 2016-02-13 22:41:16 -08:00
Kyle Spier-Swenson
889304239e Speed up process_cell() by caching the nearby turfs rather then do a lookup each loop. 2016-02-13 22:41:15 -08:00
oranges
4058f268e1 Fix how AI turrets assess human perps 
Now it matches how the old logic worked

Probably also takes care of how heavy turrets are at the moment.
 2016-02-14 19:39:29 +13:00
Kyle Spier-Swenson
50d276711a Update components_base.dm 2016-02-13 22:23:31 -08:00
Kyle Spier-Swenson
202e6e1fe7 Partial revert of 14756 (Pipes don't transport air across time and space) 2016-02-13 22:22:19 -08:00
Cheridan
7d93b7d6c4 Merge pull request #15386 from Zerrien/master 
Adds unique icons for the 2 types of patches.
 2016-02-13 23:36:04 -06:00
Cheridan
961ba81325 Merge pull request #15475 from Fox-McCloud/laser-eyes 
Adjusts Laser Eyes
 2016-02-13 23:18:52 -06:00
Bjorn Neergaard
447ffb3113 aaaaaa 2016-02-13 23:05:05 -06:00
Kyle Spier-Swenson
35518eeefb converts sleep to proc form 2016-02-13 20:29:49 -08:00