cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 04:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,258 Commits 26 Branches 2 Tags
2cf6acd4e752e9893ab2acf7f788caa5cd4ec91b
Commit Graph

7598 Commits

Author SHA1 Message Date
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
ZomgPonies
ad27574f18 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-23 04:29:55 -04:00
ZomgPonies
096cae4dd4 Hopefully cut down on ressource size and speed up loading 2014-06-23 04:29:22 -04:00
Regen
1dd805e115 Jukebox more songs first iteration 2014-06-23 00:49:07 +02:00
mwerezak
2dd832af53 Fixed misplaced prob(), added notes 2014-06-22 14:17:22 -04:00
Zuhayr
38559ab477 Makes forks usable. 
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
	icons/obj/kitchen.dmi
 2014-06-22 10:58:50 -04:00
Mloc-Argent
8a5079d006 atmos: fix everlasting fires 
Fires were checking against a non-reduced air sample for existance, so
the reduced sample wasn't working in zburn when it failed the check.
Also fixed volatilefuel not being scaled in the phoron reagent.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/ZAS/Fire.dm
	code/modules/reagents/Chemistry-Reagents.dm
 2014-06-22 10:54:19 -04:00
ZomgPonies
a6167c56eb Temporary exploit fix pending permanant solution from upstream. Thanks for the find! 2014-06-22 06:49:26 -04:00
ZomgPonies
d2129f5a01 Revert "optimize crew monitor's scan()" 
This reverts commit 8e245f527db4a00088fc2b7b8576fadc11875a6a.

Conflicts:
	code/__HELPERS/global_lists.dm
	code/modules/clothing/clothing.dm
 2014-06-22 06:28:41 -04:00
ZomgPonies
3e3e4abbb5 More event fixes. 2014-06-22 04:03:08 -04:00
mwerezak
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
ZomgPonies
f83fa70684 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-22 01:49:56 -04:00
Loganbacca
6225adf42f Preview icon render fix 
- Fixes #5254
- Changes organ render list to a structured list so we can control the render order
 2014-06-22 01:49:44 -04:00
mwerezak
b474afb0b5 Fixes pressure and temperature damage for autopsies 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2014-06-22 01:45:02 -04:00
Necaladun
3bfcaaec88 i'm still an idiot 
fucked up more things...should work now :3

Cannot compile to properly test because of other errors that aren't mine
for once
 2014-06-22 08:32:33 +09:30
Necaladun
55a61a67f3 negative hallucination amounts is bad 
thanks UC. Negative hallucinations may result in people seeing too much
reality.
 2014-06-22 08:17:34 +09:30
Necaladun
e17f2a0899 citalopram fix 
Citalopram now functions as an antipsychotic, reducing hallucinations. 1
unit will counter 1u of mindbreaker, but not remove it - synaptazine for
that.
 2014-06-22 08:12:41 +09:30
Mloc-Argent
40b0ecf006 optimize crew monitor's scan() 
New global list, "clothing_list".

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/__HELPERS/global_lists.dm
	code/modules/clothing/clothing.dm
 2014-06-21 17:35:31 -04:00
mwerezak
1625d82487 IPCs actually take heat damage from temperature now 
Also fixes the healthanalyzer still not scanning IPCs properly (scanning
them when it shouldn't)

Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/robot/component.dm
 2014-06-21 17:31:59 -04:00
mwerezak
4dd8b16cac Having an infection raises your body temperature 
Also the toxin damage taken during INFECTION_LEVEL_ONE is greatly
reduced.
Fixes robotic internal organs getting infections.
Fixes the organ_failure random event. Forgot to set the affected organ
as needing processing.
 2014-06-21 17:25:00 -04:00
ZomgPonies
c41a608189 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-21 17:23:37 -04:00
mwerezak
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
ZomgPonies
3591dad3cb Merge pull request #272 from Jarcolr/patch-1 
Fixes the Unathi/Shogun short frills
 2014-06-21 17:05:40 -04:00
ZomgPonies
2fd3ad5802 NSS Cyberiad to NGS Cyberiad 2014-06-21 17:02:35 -04:00
ZomgPonies
0f94b0d415 Wont be deaf if you die unconscious/knocked out. 2014-06-21 16:45:32 -04:00
ZomgPonies
1f24f692ef Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-21 16:31:37 -04:00
ZomgPonies
f8c63eaa8c Made disable attack logs actually you know...work. 2014-06-21 16:31:09 -04:00
Necaladun
3e4985351d added pockets 
pockets to mercy robes
 2014-06-22 04:10:24 +09:30
ZomgPonies
648302d3b7 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-21 14:25:29 -04:00
ZomgPonies
88e057868d Moar stuff for the attack logs 2014-06-21 14:25:11 -04:00
Necaladun
0878223871 Mercy Hood 
fluff item
 2014-06-22 03:23:19 +09:30
mwerezak
7f425ecf9b Cleans up train latching/unlatching 
Also adds a verb for turning off train engines.

Conflicts:
	code/modules/vehicles/cargo_train.dm
	code/modules/vehicles/train.dm
 2014-06-21 13:09:50 -04:00
Chinsky
47327042eb Fixes #5264 
Viruses are properly transferred to spilled blood now.
Antigens prevent from infection properly.
Lowered frequency of blood puddle virus check to cut down on processing.

Conflicts:
	code/game/turfs/simulated.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/organs/blood.dm
	code/modules/reagents/Chemistry-Reagents.dm
 2014-06-21 13:02:11 -04:00
mwerezak
177137a4b5 Infections now spread between organs 
Infections can now spread between internal and external organs.
Also changes the organ_failure random event to cause an infection
instead.

Conflicts:
	code/modules/events/organ_failure.dm
	code/modules/organs/organ.dm
 2014-06-21 12:55:25 -04:00