60b0659d43
Made update_power be at mob level since spells are at that level.
2014-07-18 12:11:13 -04:00
7b481d2b9e
Merge pull request #303 from VampyrBytes/master
...
fix for #300
2014-07-18 08:39:33 -04:00
08813d45cc
Fix potential ready-dna problems.
...
Conflicts:
code/game/machinery/cloning.dm
code/modules/projectiles/projectile/change.dm
2014-07-18 06:18:12 -04:00
b3e12edbc4
fix for #300
...
Fixes ling return to life
2014-07-17 13:27:58 +01:00
34712ecc37
Fix for internal organ surgery
...
Fixes internal organ surgery, and some other places where the same
problem would have cropped up
2014-07-16 20:17:50 +01:00
994a5bebbf
Fix admins having to toggle genes several fucking times to get them to turn on sometimes.
...
Fix adminbus toggling genes on to cause all other genes to manifest - added genemutcheck proc and domutation proc to handle the changes.
Added a global list of gene datums that match the order of the randomized blocks in genetics to allow for easy lookup based on blocks and allows single gene checking to work.
Conflicts:
code/game/gamemodes/setupgame.dm
code/modules/admin/verbs/debug.dm
2014-07-17 05:27:05 -04:00
aafa11712a
Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!
2014-07-16 00:53:08 -04:00
92ac2f4568
Correct pregame_timeleft from my debug value 20 to production value 180.
2014-07-15 07:25:42 -04:00
9b45dbabfb
Continued work in progress on a major revision of the NanoUI templating system.
...
Conflicts:
code/ATMOSPHERICS/components/omni_devices/filter.dm
code/ATMOSPHERICS/components/omni_devices/mixer.dm
code/game/dna/dna_modifier.dm
code/game/machinery/cryo.dm
code/game/machinery/kitchen/smartfridge.dm
code/modules/nano/nanoexternal.dm
code/modules/nano/nanomanager.dm
code/modules/nano/nanoui.dm
code/modules/power/apc.dm
code/modules/power/smes.dm
code/modules/reagents/Chemistry-Machinery.dm
nano/css/shared.css
nano/js/nano_update.js
nano/templates/escape_pod_console.tmpl
2014-07-15 07:22:15 -04:00
0266582acb
Missed a linebreak.
2014-07-13 06:22:39 -04:00
197fc0c36c
Cleans up some of the lore issues with Mutiny.
...
Conflicts:
code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
2014-07-13 06:22:30 -04:00
1b1961b4fd
Changed Mutiny messages to use the existing Centcomm message format.
...
Conflicts:
code/game/gamemodes/mutiny/mutiny.dm
2014-07-13 06:21:10 -04:00
661f4002a9
Fixes #5113
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-07-12 22:06:16 -04:00
399e4909d6
The death of assistants. Long live civilians!
2014-06-27 17:57:18 -04:00
cb9b6fca4d
Replacing civilian with support department. Still need to make changes on MySQL schema.
2014-06-26 19:42:14 -04:00
6b230d693f
Runtime fixes
2014-06-25 21:20:54 +02:00
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
b66631e360
Moves the non-implanted security positions from restricted to protected list, adds IA Agent to restricted.
...
Conflicts:
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/revolution/revolution.dm
2014-06-24 06:36:15 -04:00
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
096cae4dd4
Hopefully cut down on ressource size and speed up loading
2014-06-23 04:29:22 -04:00
b64441cb26
Fixes FEA temperature_expose() being used...
...
...instead of ZAS fire_act().
Conflicts:
code/game/gamemodes/blob/theblob.dm
code/game/machinery/doors/airlock.dm
code/game/objects/structures/window.dm
code/game/turfs/simulated/walls_mineral.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/reagents/reagent_dispenser.dm
2014-06-22 02:03:42 -04:00
c11e6ae106
Adds suit cooling device
...
Also:
Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/clothing/spacesuits/ninja.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mob/living/carbon/human/life.dm
2014-06-21 17:23:30 -04:00
768fb4a8bd
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-06-21 04:38:21 -04:00
fea9d8eda3
Switched verbs around, removed Fun tab, new Event tab for event coordinators
2014-06-21 04:37:50 -04:00
c187ed88c7
Deduplicating code
2014-06-21 07:36:19 +02:00
723979115c
Renames supply controller global var
...
Renamed from 'supply_shuttle' to 'supply_controller'
Conflicts:
code/controllers/verbs.dm
code/game/gamemodes/gameticker.dm
code/game/supplyshuttle.dm
2014-06-19 09:52:35 -04:00
384992c9fc
Merge pull request #252 from Regen1/Combat-borgs
...
Combat borgs + various tweaks
2014-06-18 06:01:46 -04:00
8f66499931
Blob reagents rebalance.
...
Blob mobs now spawn a FUN reagent mix on death instead of blob spores.
2014-06-18 02:27:36 +02:00
b8494c2822
Merge pull request #257 from alex-gh/mutiny_pinpointer
...
Fixed Mutiny pinpointers disappearing from cargo lists
2014-06-17 18:26:45 +02:00
5a6ccf0d9d
Fixed Mutiny pinpointers disappearing from cargo lists
2014-06-17 18:24:13 +02:00
4a2993b20b
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
Conflicts:
code/__HELPERS/unsorted.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/mob/living/simple_animal/bees.dm
code/modules/projectiles/gun.dm
code/modules/reagents/reagent_containers/syringes.dm
code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
01ee4f0ce9
Removes random chance from code words and makes them a bit more noticeable.
...
Conflicts:
code/game/gamemodes/traitor/traitor.dm
2014-06-17 02:17:32 -04:00
f84214533a
Removing even more unneeded test messages
2014-06-17 00:06:53 -04:00
e3ed1c3781
Removed a lot of the useless testing and error logging from the runtime log.
2014-06-16 23:01:41 -04:00
ec9210da7e
Updating PR again
2014-06-17 02:48:28 +02:00
7202d60633
Rune drawing update
2014-06-14 21:52:41 -04:00
7263fc5eef
More PR fixes I guess
2014-06-14 22:46:05 +02:00
e9171a9ae3
Adds docking support to shuttles, NanoUI
...
Conflicts:
code/game/machinery/doors/airlock.dm
code/game/machinery/doors/airlock_control.dm
code/game/machinery/embedded_controller/docking_program.dm
code/modules/shuttles/shuttle.dm
nano/css/shared.css
2014-06-14 04:10:39 -04:00
1f90fe05c8
Adds docking controllers to shuttles
...
Shuttles dock at round start.
Conflicts:
code/modules/shuttles/shuttle.dm
maps/tgstation2.dmm
2014-06-14 03:58:51 -04:00
361503fa8b
Converted Syndicate shuttle over to multi-shuttle setup.
...
Conflicts:
baystation12.dme
code/game/gamemodes/nuclear/pinpointer.dm
2014-06-14 02:25:15 -04:00
4385b1320c
Moved the Vox skipjack console over to a multi-destination shuttle datum setup.
...
Conflicts:
baystation12.dme
code/game/gamemodes/vox/heist/heist.dm
code/game/machinery/computer/vox_shuttle.dm
2014-06-14 02:22:11 -04:00
96c15156c8
Changeling deathgasp fix
...
Now it will look like you actually died from regenerative stasis
2014-06-13 14:33:26 +02:00
57eed9777c
Added sound effect for opening and closing Zippo lighters.
...
Corrected spelling of "independent", for flagprocs.dm.
2014-06-08 14:17:37 -07:00
b9f40d1b71
Rephrase text based on code review
2014-06-05 16:05:25 -04:00
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
6dff46eb07
I guess this fixed enthralled output at round end.
2014-06-03 16:42:04 -04:00
7fc78dd74e
Fix thrall going despite implants.
2014-06-02 13:49:36 -04:00
ae9658e4bd
Final nations fixes, pretty sure this time.
2014-06-02 00:47:04 -04:00
196cffd768
Out of bound THIS
2014-06-01 23:21:42 -04:00
7a9f6f6449
More nations fixes
2014-06-01 16:17:06 -04:00
ZomgPonies