cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-29 19:41:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 11 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

17074 Commits

Author SHA1 Message Date
ZomgPonies
05507b6ce6 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-24 06:48:40 -04:00
Mloc-Argent
69d9d9fc49 atmos: make fires more destructive 
Fires can now burn through walls, windows, and (with a high enough
 temperature) rwalls.
New proc: adjacent_fire_act().  Called on turfs that a fire isn't able
 to spread to. (walls, floor surrounded by windows, etc.)

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

Conflicts:
	code/game/objects/structures/window.dm
 2014-06-24 06:48:08 -04:00
Mloc-Argent
511d695fad turf: adds a damage model for walls 
New proc for walls: take_damage().
Damage is tracked in the "damage" var, walls will break if "damage"
 hits "damage_cap".
Damage can be repaired with a weldingtool.
Damage overlays are cached in the global wall var "damage_overlays"
 to reduce overhead.

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

Conflicts:
	code/game/turfs/simulated/walls.dm
	icons/turf/walls.dmi
 2014-06-24 06:43:41 -04:00
Mloc-Argent
5e45a8c8ce atmos: fix a geometry error 
reverse_dir is a list of reversed dir fields

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-06-24 06:37:46 -04:00
Hubblenaut
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
DJSnapshot
fc9143051f Clicking the magnetic card slot option on the desktop will eject all cards. No more eating cards! 2014-06-24 06:31:32 -04:00
Necaladun
9f0d9dc491 Access for Embassies 
Embassy ID locks - 120-127
 2014-06-24 12:57:11 +09:30
Necaladun
9b5bb0c1dc Area tags for embassies 
Area tags and fugly images
 2014-06-24 12:01:05 +09:30
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
59f1cc3b0a Forgot to process shuttles 2014-06-23 11:08:31 -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
DJSnapshot
615f81588a uses get_turf instead of get_turf_loc now 2014-06-23 06:23:11 -04:00
DJSnapshot
54bfc06609 Forgot to commit welcome.dm 2014-06-23 06:22:56 -04:00
DJSnapshot
35506b404f allows laptops to be recharged in rechargers. 
Conflicts:
	code/game/machinery/recharger.dm
 2014-06-23 06:22:41 -04:00
DJSnapshot
2d963b8a43 laptop vendor! 2014-06-23 06:17:59 -04:00
DJSnapshot
e55208bc69 fixes for potential runtimes. 2014-06-23 06:17:48 -04:00
DJSnapshot
21a1f2eefe laptop vending part 1. and more cleanup. 
Conflicts:
	icons/obj/computer3.dmi
 2014-06-23 06:17:36 -04:00
DJSnapshot
fbfecb0e99 lowercase ntos by request of mloc + updates to background. 2014-06-23 06:17:11 -04:00
DJSnapshot
54b2e5f7a7 Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do. 
Conflicts:
	code/datums/browser.dm
	html/browser/common.css
 2014-06-23 06:16:29 -04:00
ZomgPonies
f35d8d335d Paradise fixes to PR 2014-06-23 06:12:41 -04:00
DJSnapshot
8a33620554 Initial commit of Computer 3 from Paradise, along with a bunch of fixes. 
Conflicts:
	code/__HELPERS/unsorted.dm
	code/datums/browser.dm
	code/setup.dm
	icons/obj/computer3.dmi
 2014-06-23 06:02:36 -04:00
ZomgPonies
b8c1dbf620 Preparing repo for overhauled computer3 2014-06-23 05:52:00 -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
Chinsky
eef382e821 Fix for a runtime. 2014-06-22 17:04:04 -04:00
ZomgPonies
5297135386 Time to play with this var 2014-06-22 15:08:55 -04:00
ZomgPonies
de5faa1a6a Legless people can drag themselves onto chairs,bed,wheelchairs now. 2014-06-22 15:07:03 -04:00
mwerezak
2dd832af53 Fixed misplaced prob(), added notes 2014-06-22 14:17:22 -04:00
Bone White
0bebf0d357 Mecha DNA fix 
Fixes the invalid DNA error on mechs after dna locks.
 2014-06-22 17:09:23 +01: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
b66f75b6b2 ZAS setting fix suggested by Mloc 2014-06-22 09:24:34 -04:00
ZomgPonies
a6167c56eb Temporary exploit fix pending permanant solution from upstream. Thanks for the find! 2014-06-22 06:49:26 -04:00
Chinsky
7bdc096ee1 Optimizes crew console scanning to only look for mobs instead of ALL clothing items in the world. 2014-06-22 06:29:02 -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