Commit Graph

7354 Commits

Author SHA1 Message Date
Jeremy Liberman
33cd27e032 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel.
Conflicts:
	code/__HELPERS/names.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
2014-06-05 16:05:09 -04:00
ZomgPonies
b139547aa3 Made it easier for diona nymphs to grow. 2014-06-04 23:06:58 -04:00
Zuhayr
4f37a924fe Replaces the derelict, modifies the DJ station, adds a shuttle bay to Engineering.
Conflicts:
	baystation12.dme
	maps/tgstation2.dmm
2014-06-04 15:30:09 -04:00
Hubblenaut
b5b5ce98ba Movement with wheelchair not possible in space 2014-06-04 13:26:50 -04:00
Fira
df5293770d Added GhostRadio -- Allowing ghosts to spy on radio from anywhere
Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_toggles.dm
	code/setup.dm
2014-06-04 01:48:53 -04:00
ZomgPonies
958a4064de Bleh 2014-06-03 23:55:19 -04:00
ZomgPonies
4b8f0020d6 Trying to fix people not hearing radio? 2014-06-03 22:52:12 -04:00
mwerezak
0ed8ee9b19 Readds flashes to all robots except drones.
Drones also get a special low-power flashlight, now.
2014-06-03 19:22:47 -04:00
mwerezak
e9dbed994c Adds drone cameras to engineering network 2014-06-03 19:22:27 -04:00
mwerezak
44d2ba10fa Fixes all robot_modules having access to flashes
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2014-06-03 19:21:53 -04:00
mwerezak
0490eb545e ID swiping drones now uses visible_message() 2014-06-03 19:19:08 -04:00
mwerezak
f92ce54cff Fixes #5118
Also fixes robot/access() so that it will accept any one of the accesses
in req_access, instead of all - a much more likely use case.
2014-06-03 19:17:00 -04:00
Hubblenaut
f2721ca8a6 Wheelchairs spawn on footless characters
Conflicts:
	code/modules/client/preferences.dm
2014-06-03 18:48:57 -04:00
Hubblenaut
c484390548 Fixes. Wheelchair is supposed to help the occupant and not the driver, damn it. 2014-06-03 18:47:03 -04:00
Hubblenaut
2e644b845a Adds Wheelchairs with basic driving functionality
Conflicts:
	baystation12.dme
	icons/obj/objects.dmi
2014-06-03 18:46:21 -04:00
ZomgPonies
2a2cfacc44 Need to text2num all integers in DB 2014-06-03 18:43:28 -04:00
ZomgPonies
e08ae134f7 Bleh 2014-06-03 17:59:42 -04:00
ZomgPonies
369d1b32a0 Forgot a bit of sanitation 2014-06-03 17:51:02 -04:00
ZomgPonies
f9cb8cd414 Let's just sanitize the text fields in case :) 2014-06-03 16:48:44 -04:00
ZomgPonies
7aae02db38 Final MySQL playersave system 2014-06-03 16:33:57 -04:00
ZomgPonies
048ac0994d 2nd commit of MySQL conversion. So close to the finish line. 2014-06-03 03:31:06 -04:00
ZomgPonies
59f63f6413 First commit converting playerfiles to MySQL 2014-06-02 22:02:15 -04:00
ZomgPonies
9d0f4680fc Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-02 13:45:13 -04:00
Zuhayr
7e1ba654e3 Fixes a minor icon-flicker thing with the drone fabricator.
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
2014-06-02 13:44:55 -04:00
alex-gh
0eed06bcc9 Stunbeams should no longer destroy computers 2014-06-02 09:49:58 +02:00
ZomgPonies
ae9658e4bd Final nations fixes, pretty sure this time. 2014-06-02 00:47:04 -04:00
ZomgPonies
196cffd768 Out of bound THIS 2014-06-01 23:21:42 -04:00
ZomgPonies
8069519686 Fixed nymph messages to make them clearer 2014-06-01 22:39:57 -04:00
ZomgPonies
210e80fc86 Fuck nymph griff! 2014-06-01 22:27:02 -04:00
ZomgPonies
d49a489cb2 Derp 2014-06-01 21:37:35 -04:00
ZomgPonies
7a9f6f6449 More nations fixes 2014-06-01 16:17:06 -04:00
Zuhayr
8769c924c5 Typo. 2014-06-01 13:29:34 -04:00
Zuhayr
31a1b6e526 Fixes #5098
Conflicts:
	code/game/objects/items/weapons/tools.dm
	code/modules/power/cable.dm
2014-06-01 13:29:18 -04:00
Zuhayr
73d9498361 Drones fixes. 2014-06-01 13:26:35 -04:00
Zuhayr
f367c1aef2 Drone door fix. 2014-05-31 13:45:07 -04:00
alex-gh
44f5d05537 Adds a drone spawn blurb. 2014-05-31 18:40:31 +02:00
Zuhayr
d041c7af2d Several drone fixes (walking over, pushing, pulling, AI sync)
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2014-05-31 18:25:07 +02:00
Zuhayr
c840622c82 Added smaller spraybottle for drones. 2014-05-31 18:11:48 +02:00
Mloc-Argent
106fe78649 mining: fix for mining cooling down
Hacky thing that was already done to space. TCMB->T0C

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-31 10:39:20 -04:00
ZomgPonies
d11c999fc2 HurrDurr 2014-05-30 22:29:11 -04:00
ZomgPonies
7078b9c30a Igniters fix 2014-05-30 16:19:49 -04:00
ZomgPonies
687c46904e SHOULD fix fueltank bomb assemblies >:D 2014-05-30 13:07:28 -04:00
Mike
eff5baae08 C02 -> carbon_dioxide
Renamed carbon dioxide breathing type string to hopefully prevent
confusion in the future.

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
2014-05-30 11:55:42 -04:00
mwerezak
bfd2cd036c Fixes missing 'else'
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2014-05-30 11:45:08 -04:00
mwerezak
6333840028 Adjusts co2 warning frequencies 2014-05-30 11:44:27 -04:00
mwerezak
f619e27a67 Completed unfinished species.breath_type switch
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2014-05-30 11:44:14 -04:00
mwerezak
9f0f22ec7e New system for CO2 asphixyation
Too much CO2 now makes you slowly gain oxyloss instead of making you
fall unconscious immediately and quickly killing you after 30 seconds.

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2014-05-30 11:29:58 -04:00
ZomgPonies
400047c023 We use this 2014-05-30 11:22:36 -04:00
Ccomp5950
c862f131ac Bot down? Let's not lock up the entire server.
Instead we'll spawn a thread to handle it, not like we care what is returned either way.

Conflicts:
	code/modules/ext_scripts/irc.dm
2014-05-30 11:21:50 -04:00
ZomgPonies
99562efb0a Oops 2014-05-29 22:47:13 -04:00