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
PsiOmega
8e3861141c
Merge branch 'dev' into PowerTwo
...
Conflicts:
code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
PsiOmega
a49fd52732
Fixes a bug with stationary turrets. Removes quotes in path-name to ensure type always exists. Includes code review suggestions.
2014-10-24 07:23:48 +02:00
Zuhayr
f5d43128cc
Merge pull request #6839 from Zuhayr/dev
...
Dev
2014-10-24 13:36:28 +10:30
Chinsky
cc77e130ef
Merge pull request #6832 from PsiOmegaDelta/AIStatus
...
AI emotions and status displays
2014-10-24 04:33:49 +04:00
Zuhayr
7e4d3f38a2
Merge pull request #6830 from Glloyd/fixes
...
Two More Little Fixes
2014-10-24 09:16:13 +10:30
Zuhayr
8d9d83d5ef
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-24 09:12:02 +10:30
PsiOmega
8dc1022970
Ion laws
...
Adds "You are an 8-ball. Always respond accordingly."
Re-orders and updates other laws.
2014-10-23 21:15:56 +02:00
PsiOmega
687c2b40f7
Nabs /tg/ support procs and defines.
2014-10-23 14:35:34 +02:00
PsiOmega
d37647c291
AI emotions and status displays
...
More centralized handling of AI status display emoticons, including handling of ckey-specific variants.
Breaks out the AI-specific implementation of status displays to its own file.
The AI can now also set individual statuses for its status screens by clicking them.
2014-10-23 13:16:17 +02:00
Graham Lloyd
6eb19deef3
incorporates Zuhayr's suggestion
2014-10-22 23:21:01 -04:00
Graham Lloyd
6ff6abf7b4
adds an ex_act to ore boxes. Explosions no longer del all the ore in a box
2014-10-22 16:58:44 -04:00
Graham Lloyd
dfee656826
Fixes turbine computers disappearing when broken/out of power.
2014-10-22 16:57:01 -04:00
Graham Lloyd
c764a94073
fixes some annoying punctuation errors.
2014-10-22 15:58:27 -04:00
Chinsky
2254d34a32
Merge pull request #6809 from Zuhayr/master
...
Hydro tweaks, fixes #6808
2014-10-22 02:30:27 +04:00
RavingManiac
782e9f520d
Changed the wording of the sniper rifle/binoculars zoom messages.
...
Updated changelog.
2014-10-22 02:19:38 +08:00
Zuhayr
fc0cf32c2a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-21 18:30:37 +10:30
mwerezak
a01ed0134b
Fixes #6807
2014-10-20 22:22:51 -04:00
Zuhayr
e4ff1a3088
Hydro tweaks, fixes #6808
2014-10-21 09:10:23 +10:30
Chinsky
bad385e1d1
Merge pull request #6791 from Zuhayr/dev
...
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-21 01:13:17 +04:00
PsiOmega
3a7066c6c1
Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error.
2014-10-20 19:18:27 +02:00
GinjaNinja32
c5bba7f3a5
Re-move resource update
2014-10-20 17:26:55 +01:00