mwerezak
39feaf0870
Space areas no longer use dynamic lighting
2015-08-23 17:05:56 -04:00
Chinsky
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
Chinsky
b2e9a7c2a6
Merge pull request #9942 from RavingManiac/dev
...
Sound environment revamp
2015-08-20 19:47:09 +03:00
GinjaNinja32
894b559e29
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-19 07:04:40 +01:00
mwerezak
ac738f3db4
Moves flags values to item_flags var
...
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
2015-08-18 17:18:25 -04:00
mwerezak
d3a40f4269
Cleans up defines
...
Replaces bitflag values with hex literals. Some other miscellaneous
cleanup.
2015-08-18 17:05:26 -04:00
mwerezak
b361f9ad12
Fixes #10723
2015-08-18 10:28:06 -04:00
mwerezak
7c8c42137e
Fixes #10680
2015-08-18 02:54:13 -04:00
PsiOmegaDelta
55bc41241f
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/setup.dm
2015-08-17 09:37:49 +02:00
mwerezak
524548cc95
Fixes #10680
2015-08-16 14:58:27 -04:00
PsiOmegaDelta
4bb6749f24
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-11 08:34:46 +02:00
PsiOmegaDelta
e1aff6a668
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/doors/door.dm
code/game/machinery/portable_turret.dm
2015-08-11 08:21:06 +02:00
Atlantis
d3dbf3c199
Adjusts names of two areas
...
- Messaging Server Room -> Research Server Room - That's the server room near toxins storage/misc. research. It has absolutely nothing to do with messaging, as it houses Research's servers only.
- AI Server Room -> Messaging Server Room - That's the actual server room that houses messaging server in central section of the station.
2015-08-10 21:39:35 +02:00
PsiOmega
570806046b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/custom_sprites.dm
code/modules/organs/organ_stump.dm
code/setup.dm
2015-08-10 17:56:14 +02:00
PsiOmega
fb6ab23189
Makes the new initialization message use the proper method.
2015-08-10 17:46:38 +02:00
PsiOmega
a710e77d46
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/master_controller.dm
code/game/area/areas.dm
2015-08-10 17:42:40 +02:00
mwerezak
12549b7e93
Fixes area power initialization
...
Power channels start on when objects initialize, then are turned off and area machines notified in area initialization if an apc is not found.
2015-08-09 19:58:37 -04:00
PsiOmega
d1a4f4b0a4
Compilation fixes and partial revert of #10456 .
2015-08-09 13:27:59 +02:00
PsiOmega
889f399356
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/area/areas.dm
code/game/machinery/alarm.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/reagents/Chemistry-Machinery.dm
2015-08-09 13:15:22 +02:00
mwerezak
83abfcf7af
Fixes #9594
...
Areas now initialize to having all power channels off.
2015-08-09 00:02:50 -04:00
PsiOmegaDelta
03578d4ea3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-06 08:12:38 +02:00
RavingManiac
aeea42ded9
Refactors floating and magboot checks. Fixes #10256
2015-08-03 23:19:04 +10:00
PsiOmegaDelta
388343a84e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/recharger.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob.dm
2015-07-20 08:28:32 +02:00
mwerezak
d3717a23a0
Removes unlimited_power var
...
Redundant and only used in one place.
2015-07-19 00:33:17 -04:00
PsiOmegaDelta
9b4d09c974
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/grenades/emgrenade.dm
code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
Zuhayr
20f93b6009
Fixes #9394
2015-07-10 00:21:17 +09:30
Mloc
ffbf547923
Merge pull request #9889 from PJB3005/bay-lights
...
Lighting optimizations + NVG meson fix
2015-07-09 14:50:10 +01:00
RavingManiac
8062bed76f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-07-07 11:53:33 +08:00
PsiOmegaDelta
f420dd9f01
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defines.dm
code/modules/mob/living/silicon/silicon.dm
code/setup.dm
2015-06-30 08:59:34 +02:00
PsiOmegaDelta
0624fced64
Compilation.. fix and ensuring the Thunderdome isn't a dark pit.
2015-06-30 08:46:32 +02:00
RavingManiac
389b3fdf74
Changed the way sound environments are defined. More tweaks to sound environments. Hallucination, drugging and dizziness affect sound environment
2015-06-27 15:33:01 +10:00
RavingManiac
d1cc0517ce
Sound environment changes. Different values for hallways, carpeted rooms, maintenance tunnels, etc. Holodeck sound environment changes with the loaded program
...
In low-pressure or space, sounds will be heard in sound environment 22 (underwater))
2015-06-27 03:47:37 +10:00
PJB3005
c48ffa8d63
Lighting optimizations + meson fix
2015-06-23 17:46:11 +02:00
PsiOmegaDelta
9887f16135
mob/living/Life() now has basic gravity handling (no overrides).
2015-06-17 15:32:23 +02:00
GinjaNinja32
3434826eaf
Merge pull request #9490 from Zuhayr/xenoruins
...
Random map generator expansion.
2015-06-02 20:59:52 +01:00
Zuhayr
ebe62cefd8
Refactored random map generator system and added several terrain generators.
...
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
2015-06-03 04:36:19 +09:30
PsiOmegaDelta
3988d6ac90
Merge pull request #9388 from Techhead0/prisonBreak2.0
...
Refactors and expands the Prison Break event.
2015-06-02 18:58:20 +02:00
Techhead0
637135b0b5
Removes relative pathing, adds better comments.
2015-06-01 00:02:56 -04:00
Techhead0
2b8d6db61e
Refactors Prison Break event.
...
Affects the Brig, Virology, Xenobiology or all three.
Adds warning messages to Engineering request consoles and AI.
Prevents doors from bolting open if unpowered
Reduces light overload frequency.
2015-05-31 23:25:52 -04:00
Zuhayr
15070d729d
Dev-freeze into dev merge.
2015-05-30 00:31:12 +09:30
Atlantis
a4c29238aa
Refactors get_apc()
...
- Fixes #9536
- Area now has APC variable, instead of list. APC construction, etc. should have checks to allow one APC per area only, so situations with multi-APC areas are unlikely, unless adminbus occurs. Either way, with or without this commit, one of the APCs would be unoperational (no load)
- get_apc() no longer uses very laggy locate() in contents of area. In situations where get_apc() is called repeately this brings massive increase in performance (from 0.120 to 0.000, depending on area size and amount of things in contents of that area) as it now only returns the apc variable.
2015-05-28 17:11:26 +02:00
Atlantis
2f74a6d3c2
Telecommunications Solar Arrays
...
- Makes telecommunications solars actually work. They are connected into ring-shaped cable running around whole telecomms, powering single SMES unit which in turn powers the satellite itself.
- Installed solars have maximal combined output of 240kW. Real output fluctuates between 120kW and 160kW depending on star orientation.
- Fractal generator and relevant breaker removed. RCON control is still possible, by adjusting SMES settings.
2015-05-25 06:18:10 +02:00
Mloc
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
Mloc
e602a7e286
remove the sub-area system
...
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:29 +01:00
PsiOmega
b349e76604
Cloning vats and DNA scanners are again located by cloning computers.
2015-05-06 09:27:11 +02:00
PsiOmega
d7bbc6f1c3
Makes it possible to define custom ambiance music for holodeck programs.
...
Cleans up holodeck code. Revives an old SS13 track, THUNDERDOME!
2015-04-25 10:53:14 +02:00
Zuhayr
c7ec25e8f8
Merge pull request #8855 from comma/soundenv
...
Sound environments
2015-04-23 17:04:30 +09:30
PsiOmega
516b60962e
Merge remote-tracking branch 'upstream/dev' into CultPorting
2015-04-14 15:54:22 +02:00
PsiOmega
0466a1f47a
Camera network refactor - Part 3
...
Swept through every single Z-level, re-named/networked every single camera.
Fixes the AI Jump-To-Network verb not properly updating the network (used by the Show-Camera-List verb).
Also removes redundant Cancel option in the Show-Camera-List.
2015-04-14 11:41:01 +02:00
PsiOmega
1511e2b3f4
Ports /vg/'s Nas-Sie remake.
...
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
2015-04-12 16:19:16 +02:00