beda3185eb
Reverts the second mob clean up because of incomplete implementation.
...
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
98badae45f
Merge branch 'master' into cleanupTwo
2016-04-21 11:41:32 +03:00
b356f5cf21
Construction Update
2016-03-25 16:02:36 -04:00
df5a0d7941
Mob inventory cleanup
...
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
acc78a8000
Changes types of ghosts and eyes
...
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``
Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
93ee28d747
Merge pull request #887 from Kelenius/oldcodeRemoval
...
Removes old unticked code
2016-02-06 12:37:40 +10:30
c9c9dde819
Removes old unticked code
2016-02-01 12:47:20 +03:00
b86c730695
Removes the old virus system
...
Appendicitis moved to appendix organ
2016-01-27 11:44:41 +03:00
d71573e749
Further work on properly integrating, updating and fixing prosthetic options.
...
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
a3b9ab1236
Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection.
2015-09-26 09:19:58 +02:00
11a03abbf7
Makes more external sources of radiation respect rad-protection.
...
More radiation sources now use the apply_effects() proc to increase rad levels, as this proc respects radiation protective gear (such as radiation suits).
Does not affect internal sources, such as food, injections, etc.
2015-09-25 15:02:20 +02:00
5fbe0819b7
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/Sleeper.dm
2015-08-17 13:05:58 +02:00
77d0bbd643
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
e1aa05be02
Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates
...
Conflicts:
code/game/machinery/computer/security.dm
2015-07-28 09:16:34 +02:00
0ba7643217
Updates files as necessary to adhere to the new standard.
2015-07-27 09:32:51 +02:00
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
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
8b81dadfc5
More cleanup
...
Removes dynamic member lookup in rechargestation.dm. Removes unused proc allow_drop().
2015-07-23 01:56:39 -04:00
87d4cf4f68
Computers are now overlay based.
...
Computers now use an overlay based system, instead of demanding a full set of icons (on, off, broken) for every different computer.
Partially ports ParadiseSS13/Paradise#1468 which is a port of tgstation/-tg-station#9931 .
2015-07-07 17:23:49 +02:00
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
ee88e7b8b4
Base Life-addition()
2015-06-13 13:36:08 +02:00
de4f085057
code/game, excluding code/game/machinery and code/game/objects
2015-05-29 21:51:27 +01:00
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
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
7129feb417
Removed some cocked up files.
2015-04-13 22:58:32 +09:30
a3ed7fc033
Should fix the head and hair issues from the organ rewrite.
2015-04-03 05:41:33 -07:00
84b903cf69
Fixes #8702 properly.
2015-04-01 17:57:28 -07:00
41ff9819bd
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/organs/organ_internal.dm
code/modules/organs/organ_objects.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-03-31 17:44:42 +03:00
601e6fb7ef
Merged with dev.
2015-03-31 11:17:13 +10:30
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
1a000b0e0f
Merge remote-tracking branch 'upstream/dev' into NarsiePort
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-03-29 13:04:53 +02:00
464d702d4b
Mob refactoring.
...
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
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
0c3a18b0b6
Merge pull request #8380 from volas/sanitize_procs
...
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
aa6439096c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 23:25:26 +10:30
139edb4f9b
Fixed up some boilerplate.
2015-03-26 23:24:56 +10:30
ba648e3e8d
Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.
2015-03-26 12:45:12 +10:30
b4b635f32d
Chemistry commit
...
I messed something in the git
2015-03-25 19:09:10 +03:00
3fe4162719
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-25 00:29:59 +10:30
855755f808
sanitize() refactor: first pass (sanitize)
2015-03-22 23:31:19 +03:00
ea8e848463
copytext() check for some input
2015-02-01 23:16:04 +03:00
bbfc6db0a3
Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)
2014-12-23 17:38:05 +10:30
8857365c1c
Fixes exploit that lets AIs use machinery even after cameras are disabled.
2014-11-30 15:24:39 +01:00
90d65aed57
Removed attack_paw, attack_animal and attack_slime.
2014-11-13 17:15:29 +10:30
92c92753fb
Manual icon file merge.
2014-10-11 06:40:36 +10:30
52d9004570
fixes #6301
...
fixes sdisability genes in general
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-08 10:21:36 +01:00
305416d5c5
Merg resolution.
2014-10-02 02:33:06 +09:30
277335f487
fixes #6541
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-09-30 20:13:41 +01:00
cc52be3192
Merge resolution, replaced 2 wires lost in map merge.
2014-09-25 23:54:24 +09:30
Datraen