Commit Graph

7631 Commits

Author SHA1 Message Date
Zuhayr
28a1e35f80 As far as I can tell, viral infections were happening irrespec
tive of medical crew being present. Lowered chance for proc as well.

Conflicts:
	code/modules/events/event_dynamic.dm
2014-06-26 21:58:46 -04:00
mwerezak
9079bb353e Improves the fix for shuttles being stuck if...
... the docking controller is destroyed.
2014-06-26 21:19:13 -04:00
ZomgPonies
cb9b6fca4d Replacing civilian with support department. Still need to make changes on MySQL schema. 2014-06-26 19:42:14 -04:00
mwerezak
d2837379d4 Fixes ERT shuttle not announcing a cancelled...
...launch if the launch is cancelled after the countdown is completed.
2014-06-26 18:23:55 -04:00
mwerezak
f5f4682b8e Updates secrets panel to use the new shuttle...
...datum correctly.

Conflicts:
	code/modules/admin/admin.dm
2014-06-26 16:58:07 -04:00
mwerezak
05c5f81b97 Fixes base shuttle console requiring engine access 2014-06-26 16:53:32 -04:00
mwerezak
38bf6b59c4 Fixes shuttles getting stuck if the docking...
...controller they are trying to dock with has been destroyed or is not
responding.
2014-06-26 16:53:11 -04:00
Necaladun
ce4066c936 Minor map tweaks and NGS-> NCS 2014-06-27 05:30:52 +09:30
Regen
38171314e9 Comment out Spider virus effect 2014-06-26 21:22:01 +02:00
ZomgPonies
64023f1260 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-26 08:07:49 -04:00
mwerezak
1284dc85c5 Fixes shuttle consoles not checking access
Generalizes machine access.
2014-06-26 07:40:51 -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
b39093732b Fix for long_jumps never leaving transition area
The previous behaviour of move() called without arguments assumed a
short_jump, which meant that the wrong origin area would be used.
2014-06-26 07:34:32 -04:00
mwerezak
ef0e9c50e9 Fixes missing announcements, bad returned() check
Also fixes some bad grammar in the shuttle authorization announcements, and reduces the number of authorizations required to 2. 3 seemed a bit high.

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
2014-06-26 07:14:40 -04:00
Bram961
32db2665a4 Permanent brain exposure fix
A fix too the permanent brain exposure glitch, now brain exposure can be
fixed by setting the skull
2014-06-26 12:13:01 +02:00
ZomgPonies
592fe0a696 New ambulance sprite 2014-06-25 17:54:34 -04:00
ZomgPonies
adfa2ca902 And another one, I'll remove them one by one until I find the one that works. 2014-06-25 13:21:09 -04:00
ZomgPonies
23d6889a28 Trying to fix lobby jukebox 2014-06-25 13:19:56 -04:00
ikarrus
73cc0fca34 -Securitrons will declare the threatlevel of the perp when making an arrest/detention
-emagging will turn declarations off
-People with criminal status "Incarcerated" or "Parolled" will increase threatlevel

Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
2014-06-25 09:32:44 -04:00
ikarrus
50bf910867 Securitron Update
-Added a new access type that will act as a weapon permit that the HoS/HoP can manage. Centcom, Security, Captain, HoP, and the Barman start with it.
-Securitrons will now have the option to declare arrests they make to anyone who is wearing a security HUD. This can be turned off per-securitron
-Securitrons now have the option to arrest humans without any IDs. Defaults to off.
-Changed how securitron threat assessment is calculated
-Removed detective access from securitrons
-Stunning and cuffing now properly bolds their text for the perp
-Pingsky has its own type now

I realise there is a lot of existing duplicate code between the EDs and the securitrons, but I don't think I'd have the capability to tackle that any time soon.

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/jobs/access.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/security.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
	code/modules/admin/verbs/debug.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-06-25 09:30:08 -04:00
Zuhayr
1f7638e243 Couple of small tweaks.
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
2014-06-25 08:42:22 -04:00
ikarrus
c9dd900ebf The Select-Equipment admin verb now includes all jobs
Useful for admins and coders alike.

Conflicts:
	code/modules/admin/verbs/debug.dm
2014-06-25 08:32:52 -04:00
ZomgPonies
a3e33913d4 Fix lamps/greenlamps. I should have done this ages ago. 2014-06-25 08:05:20 -04:00
ZomgPonies
d4bfbda9f3 Moar trying to get the lobby jukebox working. 2014-06-25 07:04:58 -04:00
Zuhayr
7fe1c6cb0e Update distribution.dm 2014-06-25 06:16:02 -04:00
Zuhayr
7f96a7d6bc Mining tweaks, removal of debug/cruft, balancing of values. 2014-06-25 06:15:49 -04:00
Zuhayr
4da65639b8 Drones now have plasma cutters instead of emags. 2014-06-24 12:11:52 -04:00
Zuhayr
ea2395b848 Fixes #5323 2014-06-24 12:11:04 -04:00
Zuhayr
519f3397d3 Added extra bit of info to drone spawn.
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
2014-06-24 12:10:38 -04:00
Zuhayr
a2fde000b6 Removed ability for drones to talk on Binary.
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
2014-06-24 12:04:31 -04:00
Chinsky
71169c7903 Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand().
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.

Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
2014-06-24 12:02:29 -04:00
Chinsky
d1932f7045 Moved same code into single organ helper to handle embedding.
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/organs/organ_external.dm
2014-06-24 11:46:56 -04:00
Chinsky
0626abe799 Lowers caused damage to make it destroy organs rarer. 2014-06-24 11:42:45 -04:00
Chinsky
2cf6acd4e7 Monkey cube now expand when eaten, leading to !!FUN!! 2014-06-24 11:42:34 -04:00
mwerezak
eb86081165 Adds direction arg for area/move_contents_to()
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays

Conflicts:
	code/modules/shuttles/shuttle.dm
	code/setup.dm
2014-06-24 07:26:03 -04:00
mwerezak
d6e768fbfd Fixes escape shuttle not transitioning
Conflicts:
	code/modules/shuttles/shuttle.dm
2014-06-24 07:12:11 -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
e6944b989c Adds shuttle controller
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.

Conflicts:
	code/controllers/master_controller.dm
	code/controllers/verbs.dm
	code/game/supplyshuttle.dm
	code/modules/shuttles/shuttle.dm
2014-06-24 07:06:48 -04:00
ZomgPonies
a4f2b0af97 Fixed ambulance, added to map 2014-06-23 15:11:33 -04:00
ZomgPonies
7da1b056cf Waaaambulance 2014-06-23 14:23:59 -04:00
mwerezak
7e057e7eb9 Minor shuttle fixes and cleanup
Readds the missing "shuttle has left the station" message, improves the
ETA calculation and reorganizes the procs in shuttle_controller.dm
2014-06-23 11:10:28 -04:00
mwerezak
d8c02c7b6e Some fixes
Conflicts:
	code/game/supplyshuttle.dm
2014-06-23 11:09:14 -04:00
mwerezak
8a873b4a1c Adds escape pods to the controller 2014-06-23 11:08:15 -04:00
mwerezak
9874ce38ce shuttle_controller now uses a shuttle datum
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/admin/verbs/randomverbs.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/power/singularity/singularity.dm
2014-06-23 11:07:58 -04:00
mwerezak
55532e51a0 Supply controller now holds a ref to it's shuttle
Instead of having to look it up every time.

Conflicts:
	code/game/supplyshuttle.dm
2014-06-23 10:33:05 -04:00
ZomgPonies
4fc76945af Compile fix 2014-06-23 06:31:20 -04:00
ZomgPonies
506bd94252 This should allow people to hear the lobby jukebox 2014-06-23 05:33:40 -04:00
ZomgPonies
3493fc0961 Forgot this 2014-06-23 04:48:34 -04:00
Loganbacca
6f75a88d16 Cargo train update
- Cleans up some old code
- Fixes some bugs
- Adds keys to start the engine

Conflicts:
	code/modules/vehicles/cargo_train.dm
	code/modules/vehicles/train.dm
	code/modules/vehicles/vehicle.dm
	icons/obj/vehicles.dmi
2014-06-23 04:47:57 -04:00
mwerezak
cbaaba0d9c Fixes #5193 2014-06-23 04:35:53 -04:00