Commit Graph

9413 Commits

Author SHA1 Message Date
GinjaNinja32
6c874842e1 Fix emergency shields activating without being turned on 2014-11-03 18:48:03 +00: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
mwerezak
6ac3c4c359 More custom loadout jackets + bandana
Adds custom loadout gear:
Searif's brown leather jacket, NT brown leather jacket, and grey hoodie.
Also brings back the orange bandana, and adjusts some siemens
coefficient values that weren't making sense.
2014-11-02 22:51:33 -05:00
mwerezak
a33fd1a2c6 Merge remote-tracking branch 'upstream/dev' into fire-extinguishers 2014-11-02 10:33:16 -05:00
mwerezak
7e2e44a61a Adds Searif's leather jackets as a custom gear 2014-11-01 23:12:21 -04:00
Ccomp5950
9e1dfa2d97 Merge pull request #6919 from mwerezak/custom-loadout
Custom loadout updates
2014-11-01 22:29:24 -04:00
Chinsky
7bfa2661fb Merge pull request #6916 from Mloc/bs12-server
serverside fixes
2014-11-02 04:47:26 +03:00
Chinsky
b64d704f8f Merge pull request #6903 from mwerezak/bite
Adjusts secondary unarmed attacks
2014-11-02 04:41:10 +03:00
mwerezak
a9399c2b79 Custom loadout updates
Adds sorting to the custom gear menu list.
Adds the white cheongsam as a custom gear item.
Moves the purple comb out of the custom item defines as it is no longer
just a custom item.
Adds pockets to the bomber jacket.
Reduces the cost of ponchos to 3.
2014-11-01 15:56:11 -04:00
Mloc-Argent
119e0a89ff webclient support
no cid checks, not supported properly on webclient

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-11-01 16:17:23 +00:00
mwerezak
3f2aeb6dc4 Merge remote-tracking branch 'upstream/dev' into faxmachine 2014-11-01 11:49:15 -04:00
mwerezak
5372b526a1 Merge remote-tracking branch 'upstream/dev' into fire-extinguishers 2014-10-31 20:29:00 -04:00
Chinsky
7c284141b8 Merge pull request #6891 from PsiOmegaDelta/Z
Multi Z-Level Compatibility
2014-11-01 02:18:23 +03:00
PsiOmega
6b895e3889 Nasty voices and now noises
Some inconsistency when body parts rip. Two sections say voice, one noise.
Going with noise unless it happens to be a use of voice I'm unfamiliar with.
2014-10-31 14:56:09 +01:00
mwerezak
d38787697a Implements sending faxes to admins 2014-10-31 00:27:00 -04:00
mwerezak
4c9cda8d7e Adjusts secondary unarmed attacks 2014-10-30 19:57:59 -04:00
PsiOmega
a5c014a3e8 Fixes #6894.
Xenomorphs no longer a whitelisted race.
2014-10-30 22:49:40 +01:00
PsiOmega
4a7199020c Makes the AI radio channel listing more dynamic. Kills copy-pasting. 2014-10-30 22:27:58 +01: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
bd08ee99b2 Merge remote-tracking branch 'upstream/dev' into PortaTurret 2014-10-29 19:17: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
9adb94ff55 Area-based Jukebox
A jukebox which alters the ambient sound in the current area and plays it with 100% probability.
Leaving the area stops the ambient sound.
Entering the area resumes playing the ambient sound.
2014-10-29 08:19:42 +01:00
PsiOmega
601aa82ffa Fixes #6879
Should've guessed there were more of those jackers hiding in the code.
2014-10-29 08:04:34 +01:00
Chinsky
e2ca549d5f Merge pull request #6870 from PsiOmegaDelta/Diona
Fixes #6868
2014-10-29 06:31:15 +03:00
Chinsky
3887ada4a4 Merge pull request #6866 from PsiOmegaDelta/Bomber
Most minor spelling correction.
2014-10-29 06:31:11 +03:00
Chinsky
6ca49f4c8d Merge pull request #6867 from PsiOmegaDelta/Anomaly
Adds hand labeler to the Excavation tools closet.
2014-10-29 06:30:57 +03:00
Chinsky
541d878d54 Merge pull request #6865 from PsiOmegaDelta/PDA
PDA newscast reception
2014-10-29 06:30:54 +03:00
Chinsky
766fe2a100 Merge pull request #6863 from mwerezak/poncho
Adds two new poncho types
2014-10-29 06:30:31 +03:00
Chinsky
8430dc0af0 Merge pull request #6858 from mwerezak/sleepers
Sleepers now use power when synthesizing chemicals
2014-10-29 06:30:21 +03:00
Chinsky
15a85f22d4 Merge pull request #6854 from mwerezak/shieldgen
Fixes emergency shield generators running with no power.
2014-10-29 06:30:04 +03:00
mwerezak
e549a22bba Removes world print, re-adds react() call
Also removes checks for if(W.reagent) in extinguisher code, as that is
being handled separately.
2014-10-28 22:13:42 -04:00
mwerezak
b8805a493f Adds two new poncho types, adjusts bomber jacket cold protection
Adjusted the cold protection so it might actually be noticable now, forgot earlier that it was mitigated by uncovered areas.
2014-10-28 21:05:58 -04:00
PsiOmega
55e44e1523 Fixes #6868
See https://github.com/Baystation12/Baystation12/issues/6868#issuecomment-60784011
2014-10-28 18:05:04 +01:00
PsiOmega
9c41148a08 PDA newscaster
One can one access and view newsfeeds from the comfort of one's PDA.
Possible to change and disable the newsmessage beep.

Known issues:
Unlike browse() NanoUI does not appear to wait for browse_rsc(), the method which to transfers image to the client's cache, to finish.
This often results in newsfeeds not always displaying their images the first time they are viewed.
2014-10-28 17:10:35 +01:00
PsiOmega
06b9881fa2 Code refactoring
AIs and borgs now share law statement procs, rather than have 95% identical code variants.
Improved handling available law-statement channels. Now lists all available radio channels + any additional variants (such as "Binary", "Holopad", etc.)
Fixes a bug where synths could not state laws on the binary channel due to improper return-value.
2014-10-28 16:12:12 +01:00
PsiOmega
8d509d9a6d Adds hand labeler to the Excavation tools closet. 2014-10-27 23:23:52 +01:00
PsiOmega
4eb4869205 Most minor spelling correction. 2014-10-27 23:09:16 +01:00
PsiOmega
83426c1ad4 Adds some checks to ensure the AI cannot go and speak on the radio if dead or has had its power shut down. 2014-10-27 08:37:36 +01:00
PsiOmega
e2a7710491 The AI now has a radio channel for its private frequency. 2014-10-26 22:44:19 +01:00
PsiOmega
8232b01ba4 Merge remote-tracking branch 'upstream/dev' into PortaTurret 2014-10-26 22:02:24 +01:00
Chinsky
3839644bd8 Merge pull request #6651 from PsiOmegaDelta/PowerTwo
Ports /tg/'s cable and powernet code
2014-10-26 23:54:31 +03:00
mwerezak
85fb8d917c Sleepers now use power when synthesizing chemicals
Also, sleeper and chemmaster power usage are now both controlled by a
constant in setup.dm
2014-10-26 15:10:37 -04:00
mwerezak
5699c92c82 Destroyed emergency shield generators no longer just disappear silently. 2014-10-26 12:18:56 -04:00
Chinsky
44a01be13f Merge pull request #6856 from Baystation12/dev-freeze
Freeze - Dev
2014-10-26 09:41:07 +03:00
mwerezak
c1cbc74d4e Fixes emergency shield generators running with no power. 2014-10-26 01:09:52 -04:00
PsiOmega
5dc3e40b34 Restores APC load balancing and the autoflag system. 2014-10-25 15:18:42 +02:00
mwerezak
a0b47ce4de Water cools hot turfs even if they do not have a hotspot.
Also adjusts fire extinguisher volumes to correspond to the new beaker
volumes, and scales things accordingly.
2014-10-24 21:45:02 -04:00
PsiOmega
0a7cbfa4cf Merge remote-tracking branch 'upstream/dev' into PortaTurret 2014-10-24 23:54:35 +02:00