Commit Graph

203 Commits

Author SHA1 Message Date
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
2014-05-31 00:17:56 +01:00
Walter0o
2b372962c8 alien weeds performance and layer fixes
recently i fixed a couple of issues with /vg/'s alien weeds and nodes, 
and i see some applying to Bay12 too.

one of those issues was the order of checks in weeds/Life().
it should cancel the weed's search for tiles to expand to without starting
the direction loop first, saving quite a few proc calls.

another issue is alien weeds having the default OBJ_LAYER layer 3 which makes them grow
over all kinds of items and objects which makes sense i guess fluffwise but
is really annoying ingame for both crew and aliens.
( and this coming from the host of Alium Deathtrap 13 ;) )
nodes stay at layer 3 to appear properly over things like AI-holopads.

a really tiny improvement is setting linked_node after the space-turf check in weeds/New().

link to the /vg/ commit : 4dcb434f72
2014-05-29 19:02:17 +02:00
Mloc-Hibernia
d1d3620a12 fix another merge issue
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-05-11 13:56:17 +00:00
Mloc-Hibernia
f606f35690 fix messy merge resolution
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-05-11 13:26:28 +00:00
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Zuhayr
8d6b5e6d5c Fixes #4911 2014-05-10 01:23:29 +09:30
RKF45
1cfd0c3342 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moreposters
Conflicts:
	code/game/objects/effects/decals/posters/bs12.dm
	icons/obj/contraband.dmi
2014-04-19 19:24:45 +02:00
Chinsky
8777c8c071 Merge pull request #4765 from Jarcolr/devupdate
New posters and sprites
2014-04-19 21:10:51 +04:00
RKF45
2c839d4c09 Second and final batch 2014-04-18 21:28:27 +02:00
RKF45
56689c887d First load of posters 2014-04-18 20:31:27 +02:00
Mike
e76f431687 Adjusted fuel spread
Made fuel stickier, so it spreads less thinly.
2014-04-17 21:19:05 -04:00
Jarcolr
4bb17b8686 Let there be space
woo
2014-04-17 23:53:27 +03:00
Jarcolr
1e9e50b467 Space and space
Woop.
2014-04-17 15:39:44 +03:00
Jarcolr
b33b71649d New posters - Nienhaus
These are new posters for more postery goodness. Credits for the sprites
go to Nienhaus.
For the sprites of the poster go to http://puu.sh/5QlUx.dmi
2 posters are not included: 6th and 7th due to reasons.
2014-04-17 15:24:11 +03:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Ravensdale
0d589ff569 Changes all instances of PLASMA in active code into PHORON 2014-04-10 00:19:29 -07:00
Ccomp5950
78968de207 Merge pull request #4674 from Jarcolr/diction
Fixes #4621
2014-04-01 13:39:11 -05:00
Jarcolr
b33e9d0b92 Fixes #4621
Shogun forgotten in time.
2014-04-01 17:36:36 +03:00
Ccomp5950
9c2e3ef84a Merge pull request #4483 from Loganbacca/chemsmoke
Chemsmoke tweaks and bug fixes
2014-02-27 03:42:51 -06:00
Ccomp5950
39383c331a Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-02-26 09:38:40 -06:00
Ccomp5950
c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
Loganbacca
53b338060c Chemsmoke tweaks and bug fixes
- Renamed the variable for the smoke density mechanic to density. Also clamped it to a minimum of 1 so it cant multiply reagents.
- Added some checks so the chemsmoke effect doesn't run if it's in nullspace.
- Removed an unnecessary distance calculation.
- Added a null turf check to prevent runtimes if a really big smoke grenade goes off at the edge of the map.
- Added a check so the reagent copy code doesn't run if there's no reagents to run it on.
2014-02-27 00:59:01 +13:00
Ccomp5950
3ab7e8438a Runtime fix: Sparks trying to delete that which does not exist.
runtime error: Cannot execute null.delete().
proc name: start (/datum/effect/effect/system/spark_spread/start)
  source file: effect_system.dm,204
  usr: Mark Hoover (/mob/living/carbon/human)
  src: /datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread)
  call stack:
/datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread): start()
runtime error: Cannot execute null.delete().
proc name: start (/datum/effect/effect/system/spark_spread/start)
  source file: effect_system.dm,204
  usr: Mark Hoover (/mob/living/carbon/human)
  src: /datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread)
  call stack:
/datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread): start()
2014-02-25 00:28:00 -06:00
Loganbacca
864e097e91 Chemsmoke rewrite
- Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
- Moved it into it's own file since it's a little longer than the old one code-wise.
- Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.

Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
- Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
- The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
- The carried reagent has more volume the closer you are to the centre of the cloud.
- The visual smoke effect scales with how big the affected area is.
2014-02-22 00:47:08 +13:00
Aryn
a2d992ef5c Fixed inexplicable reversions. 2014-02-19 17:11:09 -07:00
Chinsky
499e364971 Merge pull request #4416 from Loganbacca/foam
Chem grenade fixes
2014-02-14 01:35:27 +04:00
Loganbacca
02810f7e89 Chem grenade fixes
Fixes #3986

- Foam reagent inheritance fixed:
The trans_to() proc in Chemistry-Holder.dm was calling handle_reactions() every time it would add and remove reagents with add_reagent() and remove_reagent(). I've added a safety flag to both of these procs (and copy_to()) so that trans_to will not call handle_reactions() until it has added all the reagents to the target container. This allows foam to reliably take on the properties of other leftover reagents.

- Fixed a bug in effect_system.dm that wasn't applying reagents from foam to the environment.

- Tweaked smoke to apply reagent effects after it has stopped moving
This was causing huge reagent spam at the center of the smoke cloud as it was spawning, since they were being applied every time the cloud of smoke moved. Also changed it to apply the effects 2-3 times at longer intervals (2 seconds).

- Smoke also only effects tiles in a 3x3 grid now, rather than 5x5.

- Summary:
Chem smoke does slightly less damage (if it contains damaging reagents)
Chem smoke proc calls reduced by 60-70% (significant lag reduction)
Foam works properly again
Foam proc calls reduced by 70-80%
2014-02-13 00:15:02 +13:00
Ccomp5950
942ce6ebc7 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-02-11 18:07:19 -06:00
Segrain
8e11dabf96 Bloody feet. 2014-02-09 13:30:28 +03:00
Segrain
b4a8c370ba Colouring before updating. 2014-02-09 13:21:18 +03:00
Segrain
be61c65edd Proper indentation. 2014-02-09 13:12:49 +03:00
RKF45
30f2d49f01 Quotes inside strings confuse and scare me. 2014-01-15 22:45:10 +01:00
RKF45
5083e1cd47 Requested adjustments 2014-01-13 22:54:47 +01:00
Rob Nelson
56e4b11ec5 Dynamic loading of posters
* Add dynamic loading of poster designs (untick group in DM to remove, no more toggles)
* Fixes wirecutters duping posters
* Fixes dropped posters not being placeable.
2014-01-11 18:10:31 -08:00
Rob Nelson
2e903710b0 Merge branch 'paint' of https://github.com/RKF45/Baystation12 into paint 2014-01-11 17:58:28 -08:00
RKF45
9e0391af04 Adds Baystation 12-specific posters 2014-01-12 01:42:41 +01:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
Mloc-Argent
c337e5e5f3 More elegant solution to dirt getting in the way.
Who needs to click dirt anyway?

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-01-08 21:34:15 +00:00
Zuhayr
1faf2ef25b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-08 09:42:47 +10:30
Ccomp5950
c8beb39944 Dirt Fixes. Pass ALL the attack_by's to the floor. 2014-01-05 19:17:26 -06:00
Zuhayr
2c492d8289 Using DNA2 files from master. 2014-01-03 11:19:40 +10:30
Chinsky
2cf4a9279c Merge pull request #4157 from Ccomp5950/cleanbot_fix
Bugfix:  Actually implement cleanbot targeting.
2013-12-31 17:33:14 -08:00
Ccomp5950
645710cb0b Bugfix: Actually implement cleanbot targeting.
Cleanbots won't attempt to clean up the same mess.

Also buffed how quickly they clean up dirt from 5 seconds to 2 seconds.

It was creating a blank list and then checking that list to see if anything else had
that mess targeted.  Removed the blank list check and added an actual check.
2013-12-30 21:59:20 -06:00
Zuhayr
25f7db1949 Fix for unremovable dirty tiles. 2013-12-31 11:32:36 +10:30
Zuhayr
df6bd5d6c8 Gib rewrite/resprite to allow for arbitrary blood and flesh colours. 2013-12-30 21:48:34 +10:30
Zuhayr
154717aef6 Actually stopped gibs from being shaded without making their footprints pale. 2013-12-29 04:06:17 +10:30
Zuhayr
bf820a99b6 Fixed robot gib display issue, updated single path on map to new path. 2013-12-29 03:07:20 +10:30
Zuhayr
5313851da9 Converted robots over to current blood system/paths, updated various files to work with update. 2013-12-29 02:48:20 +10:30