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
Hubblenaut
b5b5ce98ba
Movement with wheelchair not possible in space
2014-06-04 13:26:50 -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
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
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
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
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
99562efb0a
Oops
2014-05-29 22:47:13 -04:00
ZomgPonies
cf061cb953
Bunch of fixes left and right, fixes script to get giant map jpg
2014-05-29 21:40:16 -04:00
ZomgPonies
d9852332e2
Moar fixes
2014-05-29 12:27:14 -04:00
mwerezak
67f85eef2c
Inaprovaline no longer a substitute for breathing
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-05-29 10:27:18 -04:00
Zuhayr
047f0bdd67
Fixes #4643
...
Conflicts:
code/modules/mob/living/simple_animal/hostile/mimic.dm
2014-05-28 08:51:44 -04:00
ZomgPonies
2383017de1
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-05-27 20:09:39 -04:00
ZomgPonies
06bbfcf150
Final Nations patch before live testing. This is going to be painful.
2014-05-27 20:09:10 -04:00
alex-gh
21bd350299
Removed AI lawsync for drones
2014-05-27 23:31:14 +02:00
d3athrow
8db91a3273
Image pooling for human unconscious/oxygenloss/fire&bruteloss screen overlays.
2014-05-27 14:20:55 -04:00
d3athrow
f3d3bd620f
Should fix #727 for humans and monkeys.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-05-27 14:16:24 -04:00
mwerezak
3a2da98639
More sensible oxyloss scaling
2014-05-27 14:07:27 -04:00
mwerezak
ca176b63f5
Fixes inhale_pp ratio
...
The amount of inhaled gas used shouldn't approach infinity as inhale_pp
goes to zero, should it?
Also the amount of gas used should decrease with inhale_pp as the
oxyloss is being caused by the fact that fewer moles are entering the
bloodstream.
2014-05-27 14:07:18 -04:00
ZomgPonies
53090e314d
Second commit for nations, respawning is in, splitting in teams is in. Time to get to work on the actual capture mechanics.
2014-05-26 21:33:46 -04:00
ZomgPonies
3c9dbcc822
First commit for nations gamemode, setting up the framework I'll be using.
2014-05-26 20:02:20 -04:00
ZomgPonies
2ce3881ad5
Fix Fat and Skintones
2014-05-26 15:06:11 -04:00
Zuhayr
05809ec585
Changed by-species icon sheets to by-clothing species-specific icon sheets.
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/species.dm
2014-05-26 13:30:47 -04:00
Zuhayr
3af5ac76d8
Squashed hardsuit and suit cycler commits:
...
Basic preliminary breach handling.
Breached spacesuits act more sanely and now result in pressure loss.
Preliminary work for upgrading hardsuits.
Adds suit cycler.
Working on breach data for hardsuits.
More tweaks to the suit cycler.
More rig changes/tweaks.
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
2014-05-26 12:48:58 -04:00
ZomgPonies
172055dcfc
Hurr Durr
2014-05-26 06:02:20 -04:00
ZomgPonies
7ccdcbce93
Preleminary work on robolimbs. Expect more soon.
2014-05-25 18:45:49 -04:00
Jeremy Liberman
b3d3f5df8c
Mutiny fix prereqs for directives
...
Conflicts:
code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
code/game/gamemodes/mutiny/directives/terminations_directive.dm
code/game/gamemodes/mutiny/directives/test_directive.dm
code/modules/mob/mob.dm
code/modules/mob/new_player/new_player.dm
2014-05-25 22:34:39 +02:00
ZomgPonies
11a1deb1ac
Trying to cut down on attack lock spam
2014-05-24 17:17:38 -04:00
ZomgPonies
f5e69887a1
Fix Taj/Unathi/Whatever skin color. Let FurryRaveStation13 continue!
2014-05-24 08:24:09 -04:00