DJSnapshot
2a28269363
Merge pull request #4398 from RKF45/pdabomb
...
PDA bombs are now more balanced and random.
2014-02-14 16:40:26 -08: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
Ccomp5950
8ae8949b10
NanoUI PDA - Decreasing initial size of the screen.
...
Gonna miss my XBOX-LARGE pda screen.
2014-02-11 00:56:42 -06:00
Ccomp5950
5810970352
Ghosts can see PDA messages. (Redo: PR #4065 lost in merge)
2014-02-10 20:42:32 -06:00
RKF45
054df7a28b
Keeping the PDA sane.
2014-02-10 21:14:04 +01:00
RKF45
5869a3fc38
PDA bombs are now more balanced and random.
2014-02-07 23:28:40 +01:00
Rob Nelson
3121e4fb2d
DNA2 Bug Fixes - Part 2
...
We discovered that most of the problems were were having was because of BYOND passing lists (e.g. SE and UI) by-ref instead of the assumed by-val.
This commit adds dna.Clone() and (UI|SE).Copy() where needed. These should be used where DNA or SE/UI lists are COPIED, otherwise changes made in the reference will affect the real strand.
This change also messes with the gene activation logic.
2014-02-06 23:07:35 -08:00
Segrain
cec9b87289
Folder recipes.
2014-02-03 04:45:42 +03:00
RKF45
8fbcda2a0b
Reintroducing the dough-based cooking system.
2014-02-01 02:17:38 +01:00
Ccomp5950
f136fa1db2
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
icons/mob/mask.dmi
2014-01-30 12:56:23 -06:00
Ccomp5950
7962bd3277
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/supermatter/supermatter.dm
maps/tgstation2.dmm
2014-01-30 12:44:33 -06:00
Zuhayr
09ac26818d
Merge pull request #4358 from SueTheCake/armors
...
Tactical Armor Storage + Tac Armor REDUX
2014-01-30 10:33:46 -08:00
Ccomp5950
975433f898
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
icons/mob/back.dmi
icons/mob/mask.dmi
2014-01-30 12:14:44 -06:00
Zuhayr
8850a43dcb
Fixes #3847
2014-01-30 23:21:00 +10:30
Zuhayr
7a36d1c9bc
Fixes #4346
2014-01-30 21:30:58 +10:30
suethecake
6f69e7f821
Stuff.
2014-01-29 18:15:35 -06:00
Zuhayr
c0b91504b4
Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.
2014-01-28 15:59:50 +10:30
Zuhayr
5d02779d16
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-27 20:55:15 +10:30
Chinsky
ada2ba9a2f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color
...
Conflicts:
code/modules/power/cable.dm
icons/obj/power_cond_red.dmi
2014-01-27 02:27:27 +04:00
Zuhayr
1fce280da8
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-26 20:07:02 +10:30
Kilakk
44962760b8
Removed pointless output
...
* There's something here about var/revsafe being used for heads/implanted people
... or something like that
2014-01-24 15:04:41 -05:00
Kilakk
1a7616fb35
Fixes #4322
...
* There's probably a much more "modular" way of doing this, but, eh
2014-01-23 20:53:05 -05:00
Ccomp5950
283df26fa7
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-23 00:19:01 -06:00
Chinsky
5a8eb3c455
Merge pull request #4318 from Loganbacca/engineroom
...
Engine Room Redesign
2014-01-19 21:22:45 -08:00
Loganbacca
24c6063a07
Updated Supermatter user manual sprite
2014-01-20 01:57:58 +13:00
Chinsky
669ae9a1ae
Made cables use color var instead of separate icons for each color.
...
It allows for wires of ANY color (just set cable_coil var)
and most importantly
40 837 958 b - before
39 506 651 b - after
2014-01-19 03:02:58 +04:00
RKF45
5649bb7fe2
Various tiny improvements
2014-01-18 22:15:46 +01:00
Ccomp5950
8a179a8ff1
Merge pull request #4299 from Faerdan/dev
...
Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 15:21:47 -08:00
Mark Aherne (Faerdan)
024a0baa49
Canister, Tank & Tank Transfer Value NanoUIs.
...
* Added Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 01:08:45 +00:00
RKF45
0a4a7c7c08
Merge remote-tracking branch 'upstream/dev' into paintmixing
2014-01-13 22:15:33 +01:00
Ccomp5950
d5bcef4f8a
Uplink fix item spawner fix.
...
Probably a merge conflict fix or something but some code got moved to an odd spot.
2014-01-12 22:37:00 -06:00
Mloc
e826458900
Merge remote-tracking branch 'upstream/master' into dev-freeze
2014-01-12 21:55:11 +00:00
Mloc
c46d872e6c
Merge remote-tracking branch 'upstream/master' into dev
2014-01-12 19:46:31 +00:00
RKF45
b9c747aeaf
Makes mixing paints actually make sense
2014-01-12 12:04:18 +01:00
Ccomp5950
167671d583
NanoUI PDA optimizations no more sortAtom every tick on every PDA.
...
Should be noticably better on large population servers.
2014-01-11 20:09:11 -06:00
RKF45
fabfceaa5a
Fixed forever!
2014-01-11 22:50:22 +01:00
RKF45
8758ece582
Alright already.
2014-01-11 22:42:42 +01:00
RKF45
140fb27889
Fixes
2014-01-11 22:36:35 +01:00
RKF45
ab8763378b
Paint mixing
2014-01-11 22:19:02 +01:00
Loganbacca
909928f3f9
Plasma glass stacking fix
2014-01-11 18:14:51 +13:00
Chinsky
76dc0c4c49
Merge pull request #4234 from Mloc/bs12-quicklist
...
[TG] Optimized and refactored list2text, text2list, and replacetext.
2014-01-10 11:55:33 -08:00
DJSnapshot
1e4abf785e
Merge pull request #4237 from Mloc/bs12-tgstuff
...
[TG] Lots of small (and maybe not so small) changes from tg.
2014-01-09 22:33:28 -08:00
Mloc-Argent
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
Zuhayr
70fe0e02cd
Merge pull request #4245 from SkyMarshal/airfixes
...
Lots of bugfixes.
2014-01-09 02:47:20 -08:00
SkyMarshal
d43b2fa492
RCDs no longer create plating with air on it.
...
Fixes #3545
2014-01-08 17:50:59 -07:00
Kyrah Abattoir
f91b44b47f
correct paint can names and plural status, corrected pill box names, corrected lockbox names.
2014-01-08 19:56:03 +00:00
Kyrah Abattoir
98f02be5a6
code/game/object/items/weapons/* lowercase pass
...
code/game/object/structure/* lowercase pass (start)
Conflicts:
code/game/objects/items/weapons/AI_modules.dm
code/game/objects/items/weapons/paint.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/vending_items.dm
code/game/objects/items/weapons/weaponry.dm
code/game/objects/structures/bedsheet_bin.dm
code/game/objects/structures/door_assembly.dm
2014-01-08 19:56:00 +00:00
Kyrah Abattoir
7315b75cca
FIXED: inconsistencies with stack item names.
...
CHANGE: stacks are gender = PLURAL by default because it fits.
Conflicts:
code/game/objects/items/stacks/stack.dm
2014-01-08 19:48:43 +00:00
