Commit Graph

54 Commits

Author SHA1 Message Date
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Crazylemon64
20eee9064c Fixes init on various things, as well as allowing the
map loader to safely load templates mid-run
2016-07-07 23:52:44 -07:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Markolie
eea1921897 Lets ghosts access nuclear bombs and airlock controllers 2015-08-14 04:41:43 +02:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud
28eda8802a RIP Plamsa, we barely knew you...*salutes* 2015-07-01 02:40:35 -04:00
Fox-McCloud
4d04bb7750 Guts Moronic Phoron 2015-06-30 01:06:09 -04:00
ZomgPonies
5c79a9a065 Small object manipulation stuff 2015-05-26 14:00:20 -04:00
ZomgPonies
e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
Markolie
d7a2559065 Bug fixes galore 2015-03-01 20:35:07 +01:00
Markolie
c89e3ac1eb Revert "Revert "Emergency communications hotfix""
This reverts commit 3ea36839a8.
2015-02-20 17:59:07 +01:00
mwerezak
929e3fb1fd Allows escape shuttle to scan IDs from within UI
Fixes #5592

Conflicts:
	nano/templates/escape_shuttle_control_console.tmpl
2014-08-01 01:00:09 -04:00
PsiOmega
6580012663 A sensor which registers mechs and trains attempting to pass by and, if necessary, blocks their movement.
If enabled, detects mechs/trains and blocks their movement if they are coming from any of the directions set by dir. Can currently only be enabled/disabled by radio command and airlocks are updated to utilize this.

The current setup allows mechs to move through airlocks during normal cycles, which for example lets Odysseus out to save lives.
Once a shuttle docks however, the sensors are enabled to prevent boarding.

If blocked, players receive a simple message stating that their command has been overridden.
2014-07-27 14:43:11 -04:00
mwerezak
d30db958d4 Loosens the undocking requirements for airlocks 2014-07-18 08:03:53 -04:00
mwerezak
3ede5aa470 Adds default values for some docking tags
Simplifies the mapping of docking controllers by cutting down on the
number of tags needed to be entered.

Conflicts:
	code/game/machinery/embedded_controller/simple_docking_controller.dm
2014-07-18 08:03:15 -04:00
mwerezak
7823403456 Updates docking controllers
Fixed centcom and admin shuttles missing centcom side docking
controllers. Adds prison and gamma shuttle docking controllers. Adds
escape shuttle docking controllers. Adds escape pod docking controllers.
2014-07-17 00:33:49 -04:00
Mark Aherne
9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system.
Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl
2014-07-15 07:22:15 -04:00
mwerezak
f42244730b Removes duplicate defines, updates comments
Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-07-13 07:30:39 -04:00
mwerezak
8459ed1b52 Fixes #5459
Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-07-13 07:12:01 -04:00
mwerezak
e8b9375887 Allows escape pods to be armed from inside the pod
Conflicts:
	code/game/machinery/embedded_controller/simple_docking_controller.dm
2014-07-13 06:27:01 -04:00
mwerezak
117221b0d5 Adds the ability to force launch escape pods
Also reduces their countdown from 15 to 10 seconds.

Conflicts:
	maps/tgstation2.dmm
2014-06-29 12:07:13 -04:00
mwerezak
59fd7a1f18 Adds escape pod docking controller type
Escape pods now no longer launch automatically during regular crew
transfers. However they can be set to launch during a regular crew
transfer by emagging the escape pod controller.

Also fixes emergency shuttle arrival announcement having the wrong ETD.

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
	maps/tgstation2.dmm
2014-06-26 07:40:15 -04:00
mwerezak
b67c56ff5a Improves multi-airlock docking UI 2014-06-26 07:35:44 -04:00
mwerezak
d68f682bc3 Improves simple docking controller UI 2014-06-26 07:35:32 -04:00
mwerezak
3033668671 Adds multi-airlock docking controller
Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-06-26 07:31:07 -04:00
mwerezak
447ad5c3c7 Fixes airlocks being stuck if they run out of air 2014-06-26 07:15:04 -04:00
mwerezak
bd339f6156 Replaces the emergency shuttle control console
Replaces the old emergency shuttle control console with a nice new
NanoUI one. Improves the NanoUI for the docking controllers.

Conflicts:
	maps/tgstation2.dmm
2014-06-24 07:10:28 -04:00
mwerezak
f22c9db34d Streamlined docking code
Server and client now have more consistent responsibilities.
Ferry shuttles will always be forced undocked when moved, even if moved
by admin magic.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-06-14 21:29:02 -04:00
mwerezak
cdabebba3e Adjusts how undocking signals are used
Now both server and client will to undock concurrently. It looks much
more natural.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
	code/game/machinery/embedded_controller/simple_docking_controller.dm
2014-06-14 21:23:59 -04:00
mwerezak
cd540fe56d Shuttle console refactoring
Also adjusted the way undocking signals were used.

Conflicts:
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
2014-06-14 21:22:30 -04:00
mwerezak
fbd4c870eb Docking overrides now have a clear purpose
Originally the purpose of the docking override was to allow the shuttle
to move even if it couldn't undock properly (e.g. the doors were stuck
open), however it makes more sense just to have the shuttle take care of
that. This commit now makes the behaviour of the docking overrides line
up with it's new purpose.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-06-14 21:19:53 -04:00
mwerezak
cc287d00db Shuttles now dock on arrival and departure
Squashes 3 commits:

Shuttles now dock on arrival and departure

Adds docking controller to outpost, tweaks

Finishes off shuttle_console
Could use some cleanup, though.
Commented out the debug stuff.

Conflicts:
	code/controllers/master_controller.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/game/machinery/embedded_controller/simple_docking_controller.dm
	code/modules/shuttles/shuttle.dm
	maps/tgstation2.dmm
2014-06-14 04:17:37 -04:00
mwerezak
e9171a9ae3 Adds docking support to shuttles, NanoUI
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
	nano/css/shared.css
2014-06-14 04:10:39 -04:00
mwerezak
1f90fe05c8 Adds docking controllers to shuttles
Shuttles dock at round start.

Conflicts:
	code/modules/shuttles/shuttle.dm
	maps/tgstation2.dmm
2014-06-14 03:58:51 -04:00
mwerezak
64edd31d67 Generalizes embedded program
Conflicts:
	code/game/machinery/embedded_controller/embedded_controller_base.dm
2014-06-14 03:51:17 -04:00
mwerezak
ca65e48cdf Implemented docking commands
Squashed 4 commits.
2014-06-14 02:58:22 -04:00
mwerezak
5fae1db085 Initial commit
Conflicts:
	code/game/machinery/embedded_controller/airlock_program.dm
2014-06-14 02:58:00 -04:00
Asanadas
e0f4b0d1ed Bugfix: Prevents airlock_controller.dm and similar from being destroyed by mech drills or acid. Prevents headaches. 2013-05-24 14:55:28 -04:00
Cael_Aislinn
664ea3efa7 added two-way smart cycling airlocks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-04-05 16:12:31 +10:00
Cael_Aislinn
e6c70937e5 Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-28 01:07:36 +10:00
Ater Ignis
efe819ec7c Updated cycling airlocks
New controller can check secondary sensor (tag 'sensor_tag_int
') for current pressure inside of station.
2012-11-11 03:26:37 +04:00
Cael_Aislinn
12d4aed285 added anomaly /area icon_state, fixed anomaly research outpost and shuttle, added cycling airlocks to engineering singularity access (slight reshuffle of engineering areas)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-04 16:42:32 +10:00
giacomand@gmail.com
6a2d78bc94 -Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
-Atmos delay is now based on active players, to help fight lag for massive player rounds.

-Changed some for(blah in world) loops to use the correct lists.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
giacomand@gmail.com
6f7c26629d -Changed xeno to have a safe way to hatch eggs with plasma.
http://imgur.com/80LJx

-Added a turf meter which shows the air contents of a tile.
-Added a simple vent controller for the dual vents.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4935 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-22 05:41:00 +00:00
giacomand@gmail.com
f3f8340a3d Experimental tweak, I'll revert this if everyone hates it but for now I want to see how things will be if airlocks use the environmental power channel.
-Changed airlocks to use the environmental power channel.
-Changed all airlock controlling devices to use the environmental power channel.
-Changed shutters to use the environmental power channel.
-Changed pipe meters to use the environmental power channel.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4784 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 18:51:23 +00:00
sieve32@gmail.com
459c558898 -Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)
-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.

r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds

[VGTG]

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-23 00:48:51 +00:00
vageyenaman@gmail.com
d29e3be8d4 Removes poo. XSI and co. weren't very fond of it, and the last thing I would do is make them uncomfortable and challenge their leadership by keeping poo in.
An experimental lagfix, which removes a couple THOUSAND unnecessary machines from the machine processing list. Please report any unresponsive machinery (as result of this commit) as HIGH PRIORITY issues. I'm not quite sure how much lag this will kill, but I'm confident that it will be at least slightly noticeable.

More work on step_triggers. The escape shuttle should no longer blast things forever and give them infinite momentum.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3370 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-29 03:53:38 +00:00