Commit Graph

6793 Commits

Author SHA1 Message Date
PsiOmega d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +02:00
PsiOmega 3eab61e154 Soap can now clean turfs as well. 2015-04-16 08:20:00 +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
Neerti 691cee292f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 4/12/2015_bay_sync 2015-04-13 00:15:41 -04: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
Neerti bb8c78f60b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 4/11/2015_bay_sync 2015-04-11 03:06:46 -04:00
Neerti 86365c841c Reverts the bluespace relay. 2015-04-10 10:18:07 -04:00
PsiOmega 2836dcf648 Merge remote-tracking branch 'upstream/dev' into Engineering 2015-04-10 16:06:42 +02:00
Neerti 04863db4c7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 4/10/2015_bay_sync 2015-04-10 09:58:40 -04:00
PsiOmega 49d3f0fcf7 Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen 2015-04-10 15:49:36 +02:00
Neerti 191f197d79 Merge pull request #5 from Neerti/4/8/2015_bay_sync
Syncs to Bay (4/8/2015)
2015-04-10 09:41:51 -04: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
Neerti afe5acfc19 Adds support for overriding what happens when a tile is destroyed in most cases. 2015-04-10 08:36:03 -04: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
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
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
Kelenius b25993e130 Updates jar sprite
Also fixes a tiny grammar mistake
2015-04-04 18:59:03 +03:00
Kelenius db30c15e4c Updates to science
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
2015-04-04 13:38:03 +03: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
Atlantiscze 4e2769710b Initial Newmalf port
- Ports TSA Newmalf code.
- Complete overhaul of Malfunction. New modular abilities, 12 of which are in game by default.
- Adds AI hardware. AI may have only one piece and it gives unique boost in certain area (turrets strength, secondary power supply, etc.)
- Adds hardware drivers - these abilities control AI's hardware such as the APU power supply or self destruct explosives.
- Station overtake was changed to "hack all APCs" ability instead. When completed self-destruct is unlocked. Timer for station self destruct increased to 2 minutes. AI may activate/deactivate the self destruct at will.

Please bear in mind this is only INITIAL COMMIT. More commits are to follow. Minimal player count is now set to 1 but will be 2 when finished.
2015-04-03 23:00:29 +02:00
volas 2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
Kelenius 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
Kelenius 4a21810b9d Finalizes jars
Adds sprites (by Ryoku)
Places one in bartender's backroom, one in kitchen, two in xenobio
Adds autolathe recipe for them
2015-03-31 17:27:46 +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
Kelenius 8a51470461 Adds jars
Can hold money or a single lizard/mouse/spiderling
2015-03-30 19:41:54 +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
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