Commit Graph

319 Commits

Author SHA1 Message Date
PsiOmega
c45f77f247 Merge remote-tracking branch 'upstream/dev' into APC 2014-11-19 14:40:18 +01:00
Zuhayr
cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
DJSnapshot
b078365f66 vote powers r 4 admons only 2014-11-17 15:18:22 -08:00
PsiOmega
ffbbf2b858 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/ATMOSPHERICS/components/unary/heat_source.dm
2014-11-16 10:38:01 +01:00
PsiOmega
ddc1a617d0 Fixes and event end estimations. 2014-11-12 09:39:54 +01:00
PsiOmega
0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm
2014-11-11 14:13:02 +01:00
Chinsky
6b0049391f Merge pull request #6922 from PsiOmegaDelta/TheGreatEvents
Random Event Overhaul
2014-11-09 00:02:13 +03:00
PsiOmega
4ecc058150 Service personnel get their own radio frequency
Bartenders, chefs, and janitors now have their own service frequency and corresponding headset.
The HoP is listening to this channel by default.
Creates a proper locker for the chef's extra gear.
2014-11-07 20:54:57 +01:00
PsiOmega
611a8113a6 Merge remote-tracking branch 'upstream/dev' into TheGreatEvents
Conflicts:
	code/modules/events/radiation_storm.dm
2014-11-05 14:37:20 +01:00
PsiOmega
955b64e0a5 Merge remote-tracking branch 'upstream/dev' into APC. Updates map with new SMES variable names. 2014-11-03 12:51:01 +01:00
PsiOmega
fc67087d7a More Z-level compatibility
Previously missed Z-level checks in the form "z  != X".  Utilized this regex which hopefully has cought most of them [zZ](\s?)(!?)=(\s?)(\d+).
Adds more Z-level configuration, admin levels.
2014-11-03 09:57:56 +01:00
PsiOmega
ff14da90b3 Random Event Overhaul
Alters the event controller based on http://baystation12.net/forums/viewtopic.php?f=5&t=10706.
Exception is that there is always some start time variance to prevent metagaming.

Mundane, moderate, and major events run on their own timers and start and run independantly of each other.
Multiple events of the same severity degree can run at the same time. However, currently only one instance of the same event can be active at a time.
2014-11-03 09:22:37 +01:00
Chinsky
7c284141b8 Merge pull request #6891 from PsiOmegaDelta/Z
Multi Z-Level Compatibility
2014-11-01 02:18:23 +03:00
GinjaNinja32
df29429e0e Add dd_insertObjectList proc, adjust obj/machinery/New to use this proc 2014-10-30 22:59:10 +00:00
PsiOmega
bf1e6af508 Z-Level Compatibility
Now possible to configure 3 different kind of Z-levels.
Station levels: Which Z-levels the station exists on.
Contact levels: Which Z-levels are typically affected by, for example, Code Red which alters the visual state of fire alarms.
Player levels: Which Z-levels a character can typically reach.
2014-10-30 14:29:56 +01:00
PsiOmega
6ec31fc48e Fixes #6881
Automatic votes do not have to wait for vote cooldown.
2014-10-29 15:19:35 +01:00
PsiOmega
a1c19b78be Ports more of /tg/'s powernet code.
Among other things this fixes a a bug where SMES would draw excess power from the powergrid they were outputting to, rather than drawing from.
2014-10-29 14:01:35 +01:00
PsiOmega
e2a7710491 The AI now has a radio channel for its private frequency. 2014-10-26 22:44:19 +01:00
PsiOmega
8e3861141c Merge branch 'dev' into PowerTwo
Conflicts:
	code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Zuhayr
ffae0eee77 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-10-16 13:39:00 +10:30
PsiOmega
1cabbbf5a6 Master controller no longer annihilate powernets, powernets annihilate themselves.
Some misc. changes.
2014-10-15 09:44:15 +02:00
Zuhayr
ca13d1d5d8 Fixes chem splicing, bioluminescence and seed packets for xenobotany. 2014-10-15 10:05:50 +10:30
PsiOmega
322e03dd06 Makes the number of load/storable character slots a configurable value. 2014-10-14 10:05:22 +02:00
PsiOmega
a1ee4e766b Basically ripped over /tg/'s powernet and cable code into our own codebase.
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
2014-10-13 17:13:04 +02:00
Zuhayr
431a7474ea Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-07 10:06:17 +10:30
Mloc
056fbd79d1 fixes #6599
also small improvements to the loadout system

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-06 09:57:01 +01:00
Zuhayr
d7e2c0fac9 Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into xenorewrite 2014-10-01 06:06:10 +09:30
Ikmachek
a9e4f6f233 Merge branch 'master' of https://github.com/Ikmachek/Baystation12 2014-09-30 10:36:01 -04:00
Ikmachek
adc147bcc0 Reduced vote alert noise by half, now easily editable by an arg 2014-09-30 09:28:51 -04:00
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr
9fcde12b4f Organ rewrite mapclean attempt. 2014-09-29 06:18:58 +09:30
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
PsiOmega
fe126626ac Cleans up radio frequency numbers.
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
2014-09-18 13:07:34 +02:00
Mloc-Argent
9f08551a4c remove lighting area GC for now
it's causing more lag than it's helping

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

Conflicts:
	code/controllers/lighting_controller.dm
2014-09-14 17:40:07 +01:00
Chinsky
0bd8ee5c08 Merge pull request #6363 from mwerezak/pipes
Removes pump heating
2014-09-14 05:30:34 +04:00
mwerezak
9f53cb3673 Removes pump heating 2014-09-13 20:41:12 -04:00
mwerezak
97a82cfd6d Removes spawn() from radio controller 2014-09-13 16:40:24 -04:00
mwerezak
e7c2cf033e Adds config option for air compression heating 2014-09-12 01:18:12 -04:00
Zuhayr
29e59ff456 Merge pull request #6289 from comma/overmap
Overmap
2014-09-08 11:21:37 +09:30
mwerezak
d12a09addb Powernets
Moved powernet datum definition to powernet.dm
Improved APC load balancing.
Updated SMES charging to work better with new APC/powernet code.
2014-09-07 01:10:22 -04:00
mwerezak
e045c84f97 Fixes APC load totals periodically doubling
Also fixes areas updating excessively when update_use_power() was
called.
2014-09-06 11:35:58 -04:00
Mloc-Argent
726d519159 fix for lighting subarea GCing
Fixes #6102 and related issues

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-03 19:14:43 +01:00
mwerezak
b381d46556 Adds engine core atmos control
Expands on the earlier engine pump fix to add proper control over the
engine core atmos. Adds core control computer that can set output
external pressure bound instead of output pressure, and special high
power vent pump type for the engine core.
2014-08-29 14:10:43 -04:00
PsiOmega
1084a1d6d7 Optimization of machinery sort? 2014-08-24 22:52:51 +02:00
PsiOmega
68bf885e6b Announcement system refactoring.
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast

Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.

Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
2014-08-21 06:34:41 +02:00
Chinsky
c7257c1bf2 Added handling for space travel/stragglers.
Now new empty space levels are created if needed.
Added config option to use overmap system, ticked files in.

Conflicts:
	code/setup.dm
2014-08-19 19:05:17 +04:00
mwerezak
bcc07d3296 Fixes machines being able to put the radio controller to sleep 2014-08-16 14:37:44 -04:00
mwerezak
200741d611 Refactored copypasta in post_signal() 2014-08-15 20:36:45 -04:00
mwerezak
9d7c5dc197 Gives filters proper names, updates airlocks to use filters
Docking ports still don't use filters though, as it would mess with the
docking ports that are also airlocks. Docking is infrequent though so it
should be fine.
2014-08-15 20:27:00 -04:00