Commit Graph

9304 Commits

Author SHA1 Message Date
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
ZomgPonies
89508f7e7f Merge pull request #334 from Bone-White/master
Advanced Medical Hud Glasses (medihud + flash protection)
2014-07-27 11:58:42 -04:00
Bone White
abde4759ae Advanced Medical Hud Glasses (medihud + flash protection)
For blueshield and brig physician.  Also added the item to blueshield
locker.  Item allows medical record viewing/editing.  I have _NOT_ added
security record viewing/editing.
2014-07-27 16:06:35 +01:00
VampyrBytes
a5a7bb2485 Fixes job selection
Selecting Sec pod pilot will no longer toggle Atmos tec
2014-07-27 09:43:21 +01:00
VampyrBytes
f78e1c7aeb fixes #295
Vox syndi ops now start with N2 tank in hand, breath mask and internals
on

Also added N2 canister to syndie ship to allow refilling
2014-07-27 07:36:05 +01:00
ZomgPonies
eca7dee4dd Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-26 21:34:21 -04:00
ZomgPonies
5a82dd959b Fixed fucking seed vendors 2014-07-26 21:34:10 -04:00
ZomgPonies
63198289dd Merge pull request #329 from SamCroswell/master
Emagging Ripleys
2014-07-26 21:32:22 -04:00
SamCroswell
5307a410ce Emagging Ripleys
You may now emag the Ripley mech to allow guns to be mounted on it. It
does, however, leave an obvious-as-fuck bold red message in the mech's
desc. This will -only- work for the Ripley mech, god help us all if an
Odysseus ever got weapons.
2014-07-26 19:27:16 -04:00
ZomgPonies
f42b67f15a MORE CORES FOR THE BLOB GOD 2014-07-26 16:58:37 -04:00
ZomgPonies
c939be0368 Mech weapon balancing, gamma armory loadout changes. 2014-07-26 16:21:41 -04:00
Zuhayr
c0ba021bcd Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
Conflicts:
	code/datums/supplypacks.dm
	code/game/machinery/hydroponics.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/tgstation2.dmm
2014-07-26 14:03:46 -04:00
ZomgPonies
03f116b8a4 Compile fix 2014-07-26 11:34:50 -04:00
DJSnapshot
b61a4d837f fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work)
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
2014-07-26 11:31:40 -04:00
Walter0o
843d603a0b fixes nullpointer caused by broken organ list pt 2
more a prevention than a fix, but meh
Conflicts:
	code/game/objects/items.dm
2014-07-26 11:26:09 -04:00
Rob Nelson
2873262a07 Recoded wall-smoothing for optimization. Fixes #835.
Conflicts:
	code/game/smoothwall.dm
	code/game/turfs/simulated/walls.dm
	code/modules/power/singularity/singularity.dm
2014-07-25 16:29:00 -04:00
ZomgPonies
aa5746b037 Merge pull request #325 from Bram961/master
Map fixes
2014-07-25 14:26:31 -04:00
Bram961
4295c1b4fe Map fixes
-Telescience pad has atmospherics now
-LOTS of minor fixes like airlocks not having their respective
controllers, weird lights, etc etc etc.
2014-07-25 20:20:38 +02:00
ZomgPonies
bf19e7ac73 PDA investigate fix 2014-07-25 13:52:57 -04:00
ZomgPonies
ed28bc2bd8 Fix botanist spawning with 2 pda 2014-07-25 13:03:46 -04:00
ZomgPonies
dc56dc8958 Investigate PDA messages 2014-07-25 12:32:35 -04:00
ZomgPonies
b33df4745c Removed deprecated power generation stuff (AM, RUST) to free up more procs 2014-07-25 11:33:37 -04:00
Zuhayr
ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit.
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
Zuhayr
13797e99ed New machines, adjusted Cael's seeds, rewrote space vines.
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/hydroponics.dm
	code/modules/hydroponics/grown_inedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
2014-07-25 10:06:19 -04:00
ZomgPonies
034038ea33 Compile fix 2014-07-24 21:34:43 -04:00
Rob Nelson
06c9c492df Firelock rebalance, see changelog.
Conflicts:
	code/game/machinery/doors/firedoor.dm
	html/changelog.html
2014-07-24 21:28:48 -04:00
Rob Nelson
09743b6235 More burnable shit
Conflicts:
	code/game/turfs/simulated/floor_types.dm
2014-07-24 21:07:32 -04:00
Rob Nelson
72750a7731 Get rid of burning and burn_point since they're now redundant. 2014-07-24 21:02:29 -04:00
Rob Nelson
4c32f5f946 Fix jukeboxes needing reset after shuttle movement, [CLASSIFIED], warning fix.
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/atoms_movable.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/nano/nanomapgen.dm
2014-07-24 21:01:49 -04:00
DJSnapshot
83e3194596 fixes #4961 2014-07-24 18:38:34 -04:00
ZomgPonies
8fc1cc3024 Remove RadioChatter toggle as redundant and broken. Ghosts can use GhostRadio toggle while players can turn off their headsets ICly. 2014-07-24 16:35:22 -04:00
ZomgPonies
e0ad31d116 Oops 2014-07-23 17:20:59 -04:00
ZomgPonies
6b0cee85b0 Spearbug 2014-07-23 15:50:33 -04:00
ZomgPonies
6515fc7cf5 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-23 15:02:20 -04:00
PsiOmega
108cc696e3 Can now middle click doors to toggle bolt lights, plus cleanup.
Middle-clicking doors now allows the AI to toggle bolt lights.
Attempts to achieve some consistency in door feedback messages.

Conflicts:
	code/game/machinery/camera/tracking.dm
	code/game/machinery/doors/airlock.dm
2014-07-23 15:02:14 -04:00
PsiOmega
df59d8cbc7 Makes it possible for the AI to alt+left click turfs in camera view and grants ctrl/alt shortcuts to the turret control.
AI can now alt+left click turfs in camera view to list and interact with objects in the status tab. For example allows for interacting with emergency shutters beneath grills.
alt-clicking doors now notifies the AI when they are electrified/un-electrified as, unlike most other shortcuts, this doesn't have a visual cue.
When interacting with doors and the AI-control is disabled hacking is now automatically initiated, as if the AI had attempted to open the door 'menu'.
When borgs/AIs try to interact with an emagged door they now receive a feedback message that it's unresponsive.

Parts of implementation done by porting code from tg-station.

Conflicts:
	code/_onclick/ai.dm
	code/_onclick/click.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
	code/modules/mob/mob.dm
2014-07-23 14:55:03 -04:00
ZomgPonies
dc38069dd4 Merge pull request #319 from Bone-White/master
Added secrets - bomb log for more explosives
2014-07-23 14:45:25 -04:00
Bone White
d355956062 Added secrets - bomb log for more explosives
Chem grenades, ghetto grenades and standard grenades added.  All log on
priming but not explosion.
2014-07-23 19:02:47 +01:00
ZomgPonies
f2ecd1503b Completed adding Kidan Ambassador decorations 2014-07-23 13:24:51 -04:00
ZomgPonies
431ab486b3 Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row) 2014-07-23 11:04:07 -04:00
ZomgPonies
800d5b4b0b Revert "Made wizard spells into various subtypes"
This reverts commit 8b703f55af.
2014-07-23 10:58:20 -04:00
Ccomp5950
6be2c0d0fe Crew Monitor will no longer show "weird characters"
It has been talked to and feels very sorry for it's actions.

Well that and NanoUI doesn't like byond text-macros (/improper) in this case, so we just sanitize it just incase the crew monitor isn't playing nice that day.

Conflicts:
	code/game/machinery/computer/crew.dm
2014-07-23 09:10:55 -04:00
Necaladun
205b6a5560 Minimum Job Age Changes
Added/increased minimum ages for jobs
2014-07-23 19:06:59 +09:30
ZomgPonies
14b7c17b6a Spider nerf 2014-07-22 15:11:03 -04:00
Necaladun
467c289cc2 Removed gun and armour from HoP closet
Removed egun, helmet and armour from HoP because they are NOT sec.
2014-07-22 18:48:49 +09:30
Necaladun
61e8fc8117 Minor map tweaks
Moved blueshield's laptop, added proper area tag for recruiter
2014-07-22 18:21:16 +09:30
ZomgPonies
8b703f55af Made wizard spells into various subtypes 2014-07-21 09:40:42 -04:00
Rob Nelson
471bc24c1e Standardize computer luminosity shit, deduplicate power stuff. 2014-07-20 16:17:19 -04:00
dylanstrategie
d78d9eabc2 Added a few more machines
Conflicts:
	code/game/machinery/Sleeper.dm
	code/game/machinery/adv_med.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/cloning.dm
2014-07-20 11:11:40 -04:00
dylanstrategie
4e10136895 Added luminescence to some computers
- Added colored lights to all listed computers
- Should be fullly functional
- Uses the code Pomf used for Telecomms Computer testing

Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/station_alert.dm
	code/game/machinery/telecomms/traffic_control.dm
2014-07-20 11:07:59 -04:00