Markolie
e31886016b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/objects/structures/window.dm
2014-12-13 02:15:05 +01:00
Markolie
37b86cd8f1
Xenos gamemode rework
2014-12-13 02:08:22 +01:00
Fox-McCloud
e76c8f26f3
Stamina
2014-12-12 06:52:20 -05:00
Markolie
b21575f088
Bot port from /tg/
2014-12-02 17:59:40 +01:00
melandor0
7ff72c38cd
nanotrasen.se
...
Replaces 80.244.78.90 with nanotrasen.se in the code.
2014-09-04 19:45:43 +02:00
Jeremy Liberman
a4196cb745
Add Vox Heist directive and call shuttle on completion of Directive X
...
Conflicts:
baystation12.dme
code/controllers/emergency_shuttle_controller.dm
code/modules/mob/mob.dm
2014-08-06 23:12:24 +02:00
ZomgPonies
b33df4745c
Removed deprecated power generation stuff (AM, RUST) to free up more procs
2014-07-25 11:33:37 -04:00
Zuhayr
ebb9f724aa
Hydroponics rewrite, details will be in PR. Big commit.
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/game/gamemodes/events/spacevines.dm
code/game/machinery/seed_extractor.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/mob.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/food/snacks/grown.dm
icons/obj/hydroponics.dmi
maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
mwerezak
be23f29297
Fixes SpecOps shuttle having wrong initial tag set
2014-07-19 20:43:45 -04:00
Neerti
47ded176f2
Changes the wiki proc to accept player input to reach a specific page, or search for one if the wiki can't find it.
...
You can use it by typing 'wiki [query]' in the command box, for example 'wiki cult' brings up the cult guide, or clicking the wiki button at the top-right and typing what you want to look for.
It uses wikiurl, so other servers should be compilable, if they change their wikiurl.
Conflicts:
interface/interface.dm
2014-07-19 10:57:57 -04:00
ZomgPonies
12b228b799
Did those mech changes I wanted to do a while ago, reverted gamma armory to old behavior.
2014-07-17 16:50:55 -04:00
mwerezak
db521949fb
Fixes gamma shuttle location not set at roundstart
2014-07-17 11:01:49 -04:00
mwerezak
7823403456
Updates docking controllers
...
Fixed centcom and admin shuttles missing centcom side docking
controllers. Adds prison and gamma shuttle docking controllers. Adds
escape shuttle docking controllers. Adds escape pod docking controllers.
2014-07-17 00:33:49 -04:00
ZomgPonies
aafa11712a
Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!
2014-07-16 00:53:08 -04:00
Zuhayr
333c3c8ae7
Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
...
Conflicts:
baystation12.dme
code/modules/admin/admin_verbs.dm
maps/tgstation2.dmm
2014-07-13 08:44:47 -04:00
ZomgPonies
76276ace29
Cleaning out old unused code.
2014-07-13 08:10:44 -04:00
mwerezak
e8b9375887
Allows escape pods to be armed from inside the pod
...
Conflicts:
code/game/machinery/embedded_controller/simple_docking_controller.dm
2014-07-13 06:27:01 -04:00
mwerezak
1ca6e41532
Fixes status displays blanking out when escape shuttle is about to launch
...
Conflicts:
code/controllers/emergency_shuttle_controller.dm
2014-07-13 06:25:10 -04:00
mwerezak
3f7a6286b8
Improves the display of shuttle ETAs
...
Conflicts:
code/controllers/emergency_shuttle_controller.dm
2014-07-13 06:09:33 -04:00
mwerezak
40c6508ccb
long_jump() now uses an arrive_time var instead of sleeping the whole time.
...
Makes ETAs more accurate, allows the possibility of interrupting
long_jumps in the future.
Conflicts:
code/modules/shuttles/shuttle.dm
2014-07-13 06:05:29 -04:00
Mloc-Argent
f747b1e767
lighting: fix + optimize colored lights
...
turfs now directly hold color lumcounts
overlay is averaged + rounded from that instead of strings
overall colored lumcount is now rounded properly
fixes having thousands of lighting subareas after a fire
fixes #5417
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-13 05:33:10 -04:00
mwerezak
117221b0d5
Adds the ability to force launch escape pods
...
Also reduces their countdown from 15 to 10 seconds.
Conflicts:
maps/tgstation2.dmm
2014-06-29 12:07:13 -04:00
mwerezak
34c3585d6d
Fixes shuttle announcing arrival in 7 minutes.
...
Conflicts:
code/controllers/emergency_shuttle_controller.dm
2014-06-29 12:06:45 -04:00
mwerezak
d3c35251bb
Fixes macro escape slashes
...
Derp.
Conflicts:
code/controllers/shuttle_controller.dm
2014-06-26 21:20:33 -04:00
mwerezak
9079bb353e
Improves the fix for shuttles being stuck if...
...
... the docking controller is destroyed.
2014-06-26 21:19:13 -04:00
ZomgPonies
7ab91efdff
ERT shuttle fix
2014-06-26 18:44:45 -04:00
mwerezak
ebe81e4cfb
Improves shuttle ETA calculation
2014-06-26 16:52:59 -04:00
ZomgPonies
02395a5273
Missing debug controller
2014-06-26 15:09:16 -04:00
mwerezak
be27a08c3a
Adds escape pod docking controllers
...
Conflicts:
maps/tgstation2.dmm
2014-06-26 07:40:36 -04:00
mwerezak
59fd7a1f18
Adds escape pod docking controller type
...
Escape pods now no longer launch automatically during regular crew
transfers. However they can be set to launch during a regular crew
transfer by emagging the escape pod controller.
Also fixes emergency shuttle arrival announcement having the wrong ETD.
Conflicts:
code/controllers/emergency_shuttle_controller.dm
maps/tgstation2.dmm
2014-06-26 07:40:15 -04:00
mwerezak
02cc93392f
Adds escape shuttle docking controllers
...
Conflicts:
maps/tgstation2.dmm
2014-06-26 07:35:12 -04:00
mwerezak
ef0e9c50e9
Fixes missing announcements, bad returned() check
...
Also fixes some bad grammar in the shuttle authorization announcements, and reduces the number of authorizations required to 2. 3 seemed a bit high.
Conflicts:
code/controllers/emergency_shuttle_controller.dm
2014-06-26 07:14:40 -04:00
mwerezak
1845749c1a
Fixes #5351
...
Multi-shuttle origin was being assigned a path, not an actual area.
2014-06-26 07:12:13 -04:00
ZomgPonies
e58f5eda41
Derpderp
2014-06-24 21:18:19 -04:00
ZomgPonies
0e8bb2a6b4
Hotfix for rounds not ending
2014-06-24 21:16:18 -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
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
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
Chinsky
eef382e821
Fix for a runtime.
2014-06-22 17:04:04 -04:00
Chinsky
e14c19f457
Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast.
...
Adjusted color mixing helper to use inbuilt procs.
2014-06-20 12:08:30 -04:00
Chinsky
91e2bcda9c
Made lights look fancier with blend modes
...
Conflicts:
icons/effects/effects.dmi
2014-06-20 12:00:16 -04:00
Chinsky
4fe111bcdc
Got vgstation13 colored lights rewrite working here.
...
Conflicts:
code/__HELPERS/game.dm
code/__HELPERS/logging.dm
code/controllers/_DynamicAreaLighting_TG.dm
icons/effects/effects.dmi
2014-06-20 11:59:38 -04:00
mwerezak
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
ZomgPonies
e3ed1c3781
Removed a lot of the useless testing and error logging from the runtime log.
2014-06-16 23:01:41 -04:00
Zuhayr
ef59deb928
First pass on ore distribution map and stationary drilling rig.
...
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/modules/mining/coins.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/minerals.dm
code/modules/mining/satchel_ore_boxdm.dm
2014-06-15 07:35:17 -04:00
