PsiOmega
bd6ec4a98e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/atoms.dm
code/game/machinery/rechargestation.dm
2015-07-26 10:21:36 +02:00
PsiOmega
659b07415d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/rechargestation.dm
code/game/mecha/equipment/tools/medical_tools.dm
maps/exodus-1.dmm
2015-07-26 10:00:12 +02:00
mwerezak
8b81dadfc5
More cleanup
...
Removes dynamic member lookup in rechargestation.dm. Removes unused proc allow_drop().
2015-07-23 01:56:39 -04:00
GinjaNinja32
de4f085057
code/game, excluding code/game/machinery and code/game/objects
2015-05-29 21:51:27 +01:00
Kelenius
317abc6b79
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/datums/recipe.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/medbot.dm
code/game/mecha/equipment/tools/tools.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/effects/effect_system.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/extinguisher.dm
code/game/objects/items/weapons/mop.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/organs/organ_internal.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/pill.dm
code/modules/reagents/reagent_containers/spray.dm
maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
Kelenius
24ef7752cd
Merge branch 'Baystation12/dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
2015-03-28 19:14:59 +03:00
Zuhayr
0c3a18b0b6
Merge pull request #8380 from volas/sanitize_procs
...
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
Zuhayr
ba648e3e8d
Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.
2015-03-26 12:45:12 +10:30
Kelenius
b4b635f32d
Chemistry commit
...
I messed something in the git
2015-03-25 19:09:10 +03:00
volas
855755f808
sanitize() refactor: first pass (sanitize)
2015-03-22 23:31:19 +03:00
volas
ea8e848463
copytext() check for some input
2015-02-01 23:16:04 +03:00
PsiOmega
8857365c1c
Fixes exploit that lets AIs use machinery even after cameras are disabled.
2014-11-30 15:24:39 +01:00
Zuhayr
90d65aed57
Removed attack_paw, attack_animal and attack_slime.
2014-11-13 17:15:29 +10:30
Zuhayr
305416d5c5
Merg resolution.
2014-10-02 02:33:06 +09:30
Mloc
277335f487
fixes #6541
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-09-30 20:13:41 +01:00
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
mwerezak
e1dc7d436b
Fixes icons and other things not updating when the master controller updates power status.
...
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
2014-08-10 03:45:20 -04:00
Mark Aherne
6c12d62285
Merge branch 'dev' of https://github.com/Faerdan/Baystation12 into dev
2014-07-11 10:53:08 +01:00
Mark Aherne
7e7e6cd8ac
Continued work in progress on a major revision of the NanoUI templating system.
2014-07-11 10:48:42 +01:00
ZekeSulastin
c6e1dc461a
Makes DNA modifier look at dna.real_name instead of name
2014-07-06 13:02:57 -04:00
ZekeSulastin
fb4d19d8ee
Replaces hardcoded UI length with constant
2014-07-05 23:37:12 -04:00
Zuhayr
1d6501d6d3
Merge pull request #5067 from zekesulastin/langauges-again
...
#3697 (clones have no languages) fixed again
2014-05-26 23:17:52 +09:30
ZekeSulastin
bb3d947b64
Adds languages to DNA2 cloning records
2014-05-25 17:56:08 -04:00
mwerezak
296336e15e
Small fixes
2014-05-22 18:19:55 -04:00
mwerezak
637f7193fc
Fixes circuit var for other consoles
...
Also cleans up attackby while we're at it.
2014-05-22 18:05:57 -04: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
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
Mark Aherne (Faerdan)
f25052fd4c
NanoUI updates.
...
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).
2014-01-06 02:49:25 +00:00
Zuhayr
ff52920fab
DNA2 fixes cherrypicked from N3X15.
2013-12-23 00:06:56 +10:30
Rob Nelson
53c2aff420
DNA2 - A recode of DNA
...
DNA now stores blocks internally as numbers and only makes the uni_identity and struc_enzymes strings when something has changed. This is vastly more efficient.
In addition, the API for using it has been simplified. Common tasks, such as setting a sub-block, or getting a value from the block, are handled entirely by the DNA datum with simple, easy-to-use procs.
Tested on local server, but may need balancing and additional look-over since the code is from our server (/vg/) and I likely broke or forgot something.
2013-12-01 00:04:27 -08:00
ZekeSulastin
4dae789cb5
Fixes duplicate beaker on Eject Occupant
2013-11-06 19:37:56 -05:00
Mark Aherne (Faerdan)
f9906ef76e
Styling improvements for Chem Dispenser and DNA Modifier Nano UIs.
...
Injector buttons are now disabled when the injector system is not ready.
2013-09-20 23:08:04 +01:00
Mark Aherne (Faerdan)
1fe407f769
Updates to Nano DNA Modifier UI:
...
* Fixed DNA block selection.
* Added change label button.
* Added Block Injector button.
2013-09-20 01:02:08 +01:00
Mark Aherne (Faerdan)
21485aa1fd
Styling fixes for DNA Modifier Nano UI.
...
Fixed wipe and eject disk buttons.
2013-09-19 02:12:57 +01:00
Mark Aherne (Faerdan)
e0924bf4ab
Multiple minor updates to Nano.
...
Created new DNA Modifier Nano UI.
Refactored the DNA Modifier code.
2013-09-19 01:39:59 +01:00
Mark Aherne (Faerdan)
231387776b
Split dna.dm into three files to make it easier to browse the code.
...
This is a pre-cursor to my DNA Modifier rewrite using Nano UI.
2013-09-12 20:55:10 +01:00
