PsiOmega
d381eb6083
Drops the machinery part of the singularity.
2015-04-16 12:51:02 +02:00
PsiOmega
18e89ff042
Engineering/police tape can now create floor markings.
...
Apply tape to floor, get hazard overlay.
Apply tape to the same floor and in the same direction again to remove hazard overlay.
2015-04-13 15:57:45 +02:00
Zuhayr
0223223c77
Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff
...
Revenge of the Research Module (and other stuff from that PR)
2015-04-12 13:16:45 +09:30
PsiOmega
24fe95933e
Area/Camera network refactor - Part 3
...
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Engineering/Outpost/Solars updated this run.
Also includes:
Fixes #8727 .
2015-04-10 15:17:05 +02:00
Neerti
45947bb9f5
Addresses Zuh's issues so he'll stop wracking me.
2015-04-09 21:22:04 -04:00
Chinsky
7b15bd59e5
Merge pull request #8768 from Yoshax/emergencymessage
...
Emergency message changes
2015-04-09 08:15:19 +03:00
PsiOmega
71a8ddf50e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/paperwork/paper.dm
code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
Yoshax
d78ae0d509
Merge branch 'aiemergencymessage' into emergencymessage
2015-04-06 20:19:27 +01:00
Yoshax
5a34b1481b
Big emergency message changes
2015-04-06 20:17:18 +01:00
RavingManiac
e2b9657ca4
Minor fixes to supermatter manual text
2015-04-05 22:40:19 +10:00
Neerti
326fde4c5f
Adds the research module, condensed into one commit so far.
2015-04-04 20:17:59 -04:00
volas
2622d2dbfc
sanitize() refactor: fourth pass
2015-04-03 00:40:57 +03:00
mwerezak
398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
mwerezak
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
mwerezak
cdfce64ad0
Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.
2015-03-30 22:05:00 -04:00
=
2e728cfd4b
Added macros for droplimb flags.
2015-03-31 11:42:45 +10:30
=
601e6fb7ef
Merged with dev.
2015-03-31 11:17:13 +10:30
Chinsky
a8ee3ca25e
Merge pull request #8560 from PsiOmegaDelta/PCAILaws
...
PC AI laws.
2015-03-30 21:23:34 +03:00
mwerezak
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
PsiOmega
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
PsiOmega
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
PsiOmega
5b8f055595
Merge remote-tracking branch 'upstream/dev' into PCAILaws
...
Conflicts:
code/game/objects/items/weapons/AI_modules.dm
2015-03-28 20:26:24 +01: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
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
Zuhayr
c5d42f3a4b
More work on severing, improvements to yank-out-object.
2015-03-27 17:51:10 +10:30
Zuhayr
aa6439096c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 23:25:26 +10:30
Zuhayr
7ac1e44628
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 17:01:33 +10:30
Zuhayr
ba648e3e8d
Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.
2015-03-26 12:45:12 +10:30
Zuhayr
8af1a818e9
Merge branch 'monkeys' of https://github.com/Zuhayr/Baystation12 into monkeys
2015-03-26 12:18:14 +10:30
PsiOmega
41d3642813
Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.
2015-03-25 19:27:03 +01:00
Zuhayr
9c92d3851a
Got various kinds of limb loss plus dislocation working.
2015-03-25 23:11:00 +10:30
Zuhayr
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
volas
e3d41c3112
Merge remote-tracking branch 'upstream/dev' into sanitize_procs
2015-03-25 01:06:32 +03:00
Zuhayr
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
Kelenius
78bac425ad
Updates drill and scanner
2015-03-24 18:34:26 +03:00
Zuhayr
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
volas
855755f808
sanitize() refactor: first pass (sanitize)
2015-03-22 23:31:19 +03:00
PsiOmega
e0538df294
Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.
2015-03-22 17:43:20 +01:00
PsiOmega
59ec34e410
Merge remote-tracking branch 'upstream/dev' into PCAILaws
2015-03-22 17:26:09 +01:00
PsiOmega
470766e301
Moves silicon law logging to a more all-catching location.
2015-03-22 14:11:44 +01:00
Zuhayr
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
PsiOmega
273bb366f0
AI laws now refer to crew members instead of humans.
...
Notable exception: Asimov's laws remain true to the original.
2015-03-20 16:20:41 +01:00
PsiOmega
7ab57a4917
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/fancy.dm
code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
Chinsky
be8e76a01e
Merge pull request #8535 from Kelenius/ofCandlesAndTime
...
Makes candles last longer
2015-03-19 00:20:07 +03:00
Kelenius
cc9f15dd67
Makes candles last longer
2015-03-18 20:57:51 +03:00
Zuhayr
e600cdbd3b
Fixes #8430
2015-03-17 19:18:30 +10:30
PsiOmega
7f68403ae4
NanoUI - Silicon law manager
...
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
Techhead0
020e1e4c60
Tweaks.
...
Regeneralizes sunglasses. Adds plant analyzer and megaphone. Puts EMT gear under general medical.
2015-03-14 15:52:29 -04:00
