PsiOmega
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +02: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
PsiOmega
4b040d93ba
Continues the painful process of porting Destroy()s, Dels(), and everything else needed for qdel.
2015-04-17 09:47:19 +02:00
PsiOmega
1daf0abe3d
Switches around turf/datum garbage handling (my fault..). Adds null check for zone rebuilds.
2015-04-16 14:23:19 +02:00
PsiOmega
d381eb6083
Drops the machinery part of the singularity.
2015-04-16 12:51:02 +02:00
Chinsky
7848a1c300
Merge pull request #8815 from PsiOmegaDelta/CultPorting
...
Ports /tg/vg/'s Nas-Sie remake
2015-04-15 02:12:05 +03:00
PsiOmega
516b60962e
Merge remote-tracking branch 'upstream/dev' into CultPorting
2015-04-14 15:54:22 +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
PsiOmega
c616b67621
Map fixes.
...
Fixes #8441 .
Fixes #8820 .
Less stacked pipes.
Medbay now powers all its shutters.
Fixes duplicate req_access definitions.
2015-04-13 08:44:13 +02:00
PsiOmega
1511e2b3f4
Ports /vg/'s Nas-Sie remake.
...
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
2015-04-12 16:19:16 +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
Chinsky
0b7ac73f59
Merge pull request #8805 from PsiOmegaDelta/Engineering
...
Area/Camera network refactor - Part 3
2015-04-11 20:49:15 +03:00
PsiOmega
f3be9b41f0
Ports /vg/'s Nas-Sie remake.
...
First phase: Port cultify procs.
2015-04-11 13:58:08 +02:00
=
78987a436a
Merge resolution.
2015-04-11 13:23:17 +09:30
Chinsky
7a40d193fe
Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen
...
Refactors NanoUI interaction (again)
2015-04-11 04:43:50 +03:00
Chinsky
be3f372680
Merge pull request #8788 from PsiOmegaDelta/PortedSpells
...
Ports /vg/'s spell system for use by the cult port.
2015-04-11 02:05:58 +03:00
PsiOmega
2836dcf648
Merge remote-tracking branch 'upstream/dev' into Engineering
2015-04-10 16:06:42 +02:00
PsiOmega
49d3f0fcf7
Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen
2015-04-10 15:49:36 +02:00
PsiOmega
1ba8dcbca9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/vending.dm
2015-04-10 15:25:34 +02:00
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
Chinsky
5fc3a2a511
Merge pull request #8792 from GinjaNinja32/runtime
...
Runtime fixes
2015-04-10 12:24:35 +03:00
PsiOmega
e37c5c22d4
Refactors NanoUI interaction (again)
...
Takes NanoUI interaction code and splits it into more manageable modules.
The default handler that checks distances, camera coverage, etc., etc.
Admin NanoUI windows now only check for admin rights, ignoring sight, distance, and anything else.
ERT/mercenary appearance changer now remains open for as long as the mob remains on the admin Z-level.
PDAs and uplinks now require that you keep the item somewhere in your main inventory (or contents to be precise). Hands or ears are fine, inside bags are not.
Rig suits also check that they are in the operator's inventory or that the synthetic operator is somewhere within the suit's contents (recursively).
2015-04-10 11:19:38 +02:00
Kelenius
20d62c87ff
Borg module fixes
...
Fixes #8775
Fixes #8797
2015-04-10 09:50:47 +03:00
Neerti
45947bb9f5
Addresses Zuh's issues so he'll stop wracking me.
2015-04-09 21:22:04 -04:00
PsiOmega
990530d118
Ports /vg/'s spell system for the sake of cult porting.
...
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
2015-04-09 20:08:06 +02:00
GinjaNinja32
958a1c64b3
Fixes PDA detonation runtime
...
Fixes #8609
2015-04-09 16:05:53 +01: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
Mustafa Kalash
177d968933
Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first.
2015-04-06 18:40:11 -04: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
PsiOmegaDelta
fd1b6343f0
Merge pull request #8655 from volas/sanitize_procs2
...
sanitize(), part 2
2015-04-06 15:16:17 +02: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
Mustafa Kalash
94a56e3c2b
Adds a toggle for allowing a target to use a radio (handheld or headset.)
2015-04-03 17:42:16 -04:00
volas
2622d2dbfc
sanitize() refactor: fourth pass
2015-04-03 00:40:57 +03:00
mwerezak
01ce8d4a1f
Fixes #8696
...
Fixes #8696 , and updates other usages of drop_item() where appropriate.
2015-03-31 20:30:06 -04: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
Chinsky
65f61122b5
Merge pull request #8604 from Zuhayr/limbs
...
Limb objects, severing and cybernetics
2015-03-31 08:38:54 +03: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
9ad533a094
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/monkey/update_icons.dm
code/modules/mob/mob_helpers.dm
code/modules/spells/spellbook.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2015-03-31 00:16:56 -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
mwerezak
c59fac2e16
Adds unloaded item state for the STS-35.
2015-03-29 02:40:57 -04:00
