Commit Graph

13689 Commits

Author SHA1 Message Date
mwerezak
03648c220e Adds workaround for PHP whitelist
Apparently there's some PHP script that needs to be updated or
something. Revert this once that is done.
2014-06-28 12:19:57 -04:00
mwerezak
ac0bf7b853 Improves the implementation of non-verbal languages
Cleans out the nonverbal language check from say_understands(), which
now is responsible for language only.
Nonverbal languages have a chance of causing an emote when used.
Adds sign languages, which have no verbal component.
2014-06-28 12:19:34 -04:00
mwerezak
b25f5d8aa6 In space, no one can hear you shriek
Or chimper for that matter. Also fixes deaf people hearing vox shriek.
2014-06-28 10:35:20 -04:00
Jarcolr
2ed5cb2b1f Fixes #5223
This fixes #5223 and the collectable chef hat. who used "chef" instead
of "chefhat".
2014-06-28 17:19:55 +03:00
Zuhayr
2aa5460308 Merge branch 'derelict' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-28 22:36:56 +09:30
Chinsky
42a3a27329 Merge pull request #5384 from Jarcolr/custom_item
Updates a custom item sprite and adds 2 approved custom items
2014-06-28 17:00:56 +04:00
Zuhayr
cfd822f69d Reduced botanist spawn count, renamed to Gardener, increased Science and Chef spawn count, added Xenobotanist alt title to Scientist. 2014-06-28 22:24:26 +09:30
Jarcolr
be74be4c95 Fixes the jackboots 2014-06-28 14:11:58 +03:00
Zuhayr
44d6bc199a Merge pull request #5379 from PsiOmegaDelta/AIStun
AI now handles the sunned status like other creatures do in their life.dm file
2014-06-28 19:43:27 +09:30
Chinsky
c6d6bdcb58 Added system for overmap building.
-metaboject with zlevel info that should be placed on sector/ship zlevel
-overmap object that represents a map zlevel
-startup hook for building the overmap
2014-06-28 14:05:44 +04:00
Jarcolr
5de1f11e8d Updates a item sprite and adds 2 approved items
http://baystation12.net/forums/viewtopic.php?f=33&t=10693
http://baystation12.net/forums/viewtopic.php?f=33&t=10678
Paths to new files are:
/obj/item/weapon/lighter/zippo/fluff/isaac_jachym
/obj/item/clothing/shoes/jackboots/fluff/kecer_eldraran
2014-06-28 11:33:49 +03:00
mwerezak
78ed731407 Air alarms play a sound when there is an alarm 2014-06-27 23:52:47 -04:00
Zuhayr
a7f61c5036 Merge pull request #5376 from Jarcolr/patch-2
Psych bed >> psychiatrists couch
2014-06-28 08:41:02 +09:30
Jarcolr
14818b312a Psychiatrists couch 2014-06-27 22:38:57 +03:00
Zuhayr
344c6bd622 Merge pull request #5377 from Ccomp5950/teacup-spawn-fix
Teacup icon clipping fix.
2014-06-28 05:08:16 +09:30
PsiOmega
972bbac033 AI now handles EMP-stun like other creatures do in their life.dm file
Previously AI would be stunned indefinitely after being hit with an EMP-blast. This would prevent emergency shutters from being operated.
The stun status is now adjusted down in the Life()-proc like is done in the base living.dm, which the AI living.dm does not ..() call.
2014-06-27 21:24:01 +02:00
Chinsky
6bd0743aa3 Merge pull request #5367 from Zuhayr/voxwhitelist
Adds Vox as a station race, adds vox clothing icons from /vg/.
2014-06-27 19:36:31 +04:00
Chinsky
34137c5550 Merge pull request #5362 from Loganbacca/atmoso
Atmos Overhaul - Phase 1
2014-06-27 19:31:50 +04:00
Mloc
bd7161df33 Merge pull request #5370 from Zuhayr/master
Nerfs biohazard random event chance.
2014-06-27 12:05:15 +01:00
PsiOmega
596b71a4ff Adds support to better handle air alarms in sensitive areas and vents with custom settings.
Air alarms now have a new setting, breach_detection, which allows for disabling the automatic mode change when a breach occurs.

Vents now have three new settings. These are primarily for when air alarms request a mode change to ensure that custom pressure levels/checks (in terms of mapping, not set later in game)  are not lost.
external_pressure_bound_default
internal_pressure_bound_default
checks_default
2014-06-27 11:12:09 +02:00
Zuhayr
274a7a844a Merge pull request #5372 from mwerezak/emergency-shuttle
More shuttle updates
2014-06-27 18:36:37 +09:30
Ccomp5950
1ba345ca8c Teacup icon clipping fix.
Might need to be done to coffee as well.

Thanks Serveris6 for the report:  http://prntscr.com/3wyah5
2014-06-27 02:29:45 -05:00
Jarcolr
dda6ef82bd Psych bed >> Freudian couch
Vetinarix kept the icon_state name when the Medbay Renovation PR thing got in. Malsquando wanted this changed.
2014-06-27 10:22:05 +03:00
mwerezak
7ae03d127b Fixes macro escape slashes
Derp.
2014-06-26 20:48:07 -04:00
mwerezak
363df869e2 Improves the fix for shuttles being stuck if...
... the docking controller is destroyed.
2014-06-26 19:01:17 -04:00
Loganbacca
3aee224d12 Merge remote-tracking branch 'remotes/upstream/dev' into atmomerge 2014-06-27 10:18:17 +12:00
mwerezak
deb1e1007c Fixes ERT shuttle not announcing a cancelled...
...launch if the launch is cancelled after the countdown is completed.
2014-06-26 17:21:45 -04:00
Chinsky
2d52f2eac7 Merge pull request #5365 from volas/master
Fix infinite loop
2014-06-27 01:14:36 +04:00
Chinsky
ae16c5e673 Merge pull request #5368 from Zuhayr/dev
Uncommented gateway spawn point.
2014-06-27 01:13:28 +04:00
Chinsky
37eb625ee1 Merge pull request #5369 from Hubblenaut/airlocks
Fixes two wires in airlocks not triggering
2014-06-27 01:13:20 +04:00
Chinsky
b9a2d2a1f5 Merge pull request #5366 from alex-gh/mutiny_runtime_fix
Fixes multiple runtimes in mutiny mode.
2014-06-27 01:12:46 +04:00
mwerezak
84023ff1a3 Updates secrets panel to use the new shuttle...
...datum correctly.
2014-06-26 14:48:49 -04:00
mwerezak
93c13a06d5 Fixes base shuttle console requiring engine access 2014-06-26 14:48:29 -04:00
mwerezak
363ef79301 Fixes shuttles getting stuck if the docking...
...controller they are trying to dock with has been destroyed or is not
responding.
2014-06-26 13:58:56 -04:00
mwerezak
0f2ea177c9 Improves shuttle ETA calculation 2014-06-26 13:30:44 -04:00
Zuhayr
0a79a21e24 Fixed an oversight with RAD_ABSORB and collapsing. 2014-06-26 21:07:25 +09:30
Zuhayr
12fad74047 As far as I can tell, viral infections were happening irrespec
tive of medical crew being present. Lowered chance for proc as well.
2014-06-26 20:59:30 +09:30
Loganbacca
2218164df9 Bug fix and mapping example
- Fixed mapped omni devices being set to off at round start
- Remapped the research outpost atmos room, taking advantage of omni devices
2014-06-26 21:10:17 +12:00
Loganbacca
9c80541936 Mapper sanity checks
- Checks that mapped values add up to 100% so mappers can't set unusual ratios
2014-06-26 15:40:10 +12:00
Loganbacca
5af82714b2 Omni device tweaks
- Better mapping support (mapping icons and can now set mixer concentration)
- Trimmed overlay lists
- Utilized existing procs for icon generation
- Changed filter icon color to better contrast the output color
2014-06-26 14:55:53 +12:00
Hubblenaut
18d2c9ba33 Fixes two wires in airlocks not triggering 2014-06-26 03:33:47 +02:00
Zuhayr
2ee8f78f75 More icon changes, updates item paths, moves vox cortical stack spawn to raider proc, makes vox whitelisted and spawnable with internals. 2014-06-26 08:47:58 +09:30
alex-gh
8810d3db71 Fixes multiple runtimes in mutiny mode.
Example runtime:

runtime error: Cannot read null.assigned_role
proc name: get crew to terminate (/datum/directive/terminations/financial_crisis/get_crew_to_terminate)
  source file: financial_crisis_directive.dm,11
  usr: null
  src: /datum/directive/terminations/... (/datum/directive/terminations/financial_crisis)
  call stack:
/datum/directive/terminations/... (/datum/directive/terminations/financial_crisis): get crew to terminate()
/datum/directive/terminations/... (/datum/directive/terminations/financial_crisis): meets prerequisites()
mutiny (/datum/game_mode/mutiny): get directive candidates()
mutiny (/datum/game_mode/mutiny): pre setup()
/datum/controller/gameticker (/datum/controller/gameticker): setup()
/datum/controller/gameticker (/datum/controller/gameticker): pregame()
/datum/controller/game_control... (/datum/controller/game_controller): setup()
2014-06-26 00:43:53 +02:00
volas
4528f109a5 Fix infinite loop in freeform AI module 2014-06-25 23:09:21 +04:00
mwerezak
e80f42cad4 Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
Conflicts:
	code/setup.dm
2014-06-25 13:28:18 -04:00
mwerezak
ea1060ac33 Fixes shuttle consoles not checking access
Generalizes machine access.
2014-06-25 13:20:12 -04:00
mwerezak
96e584d517 Adds escape pod docking controllers 2014-06-25 13:08:22 -04:00
PsiOmega
906ef41522 The tactical closet now calls ..() in its New() proc, allows for swallowing items placed on-top among other things. 2014-06-25 18:32:48 +02:00
mwerezak
d5c5d4b21f 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.
2014-06-25 12:32:12 -04:00
mwerezak
c44ac554dd Improves multi-airlock docking UI 2014-06-25 12:28:58 -04:00