Commit Graph

2112 Commits

Author SHA1 Message Date
Chinsky
f322a6af5e Merge pull request #6992 from PsiOmegaDelta/BodyBag
Shapely body bags.
2014-11-12 23:45:36 +03:00
PsiOmega
e6a9e08886 Shapely body bags.
Body bags containing bodies now uses a previously unused icon_state with a more defined humanoid shape.
2014-11-11 11:44:33 +01:00
Zuhayr
e80d294aa5 Compile issues with the merge. PDA tapping may be broken for pAIs. 2014-11-10 13:17:17 +10:30
Zuhayr
b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
Chinsky
82e5cf4b72 Merge pull request #6965 from PsiOmegaDelta/Supply
Service personnel radio frequency
2014-11-09 00:02:07 +03:00
Chinsky
79a5170325 Merge pull request #6959 from PsiOmegaDelta/StateLaws
AI fixes
2014-11-08 11:11:04 +03:00
Chinsky
4230a20c45 Merge pull request #6963 from mwerezak/sliceable
Rewrites food slicing, energy weapons
2014-11-08 11:07:34 +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
04661c0240 AI and Topic fixes.
Adjusts the AI integrity status, no longer should it report being alive until -100%
Moves the Topic() nowindow check down to the very bottom of /obj/.
2014-11-07 11:10:32 +01:00
PsiOmega
f412eb8e1d Merge remote-tracking branch 'upstream/dev' into StateLaws 2014-11-07 09:42:53 +01:00
Ccomp5950
28635e3f8f Merge pull request #6958 from PsiOmegaDelta/TimeOfNews
Newscaster and photo cleanup
2014-11-07 01:00:18 -05:00
mwerezak
cc82a47163 Cleans up food slicing 2014-11-07 00:10:49 -05:00
mwerezak
81f8f36874 Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class. 2014-11-06 19:50:40 -05:00
Chinsky
42e2409408 Merge pull request #6942 from PsiOmegaDelta/Hacking
Wiring Upgrade
2014-11-07 03:49:38 +03:00
PsiOmega
f2dcf1acaa AI fixes
Telecommunication interruption no longer permanently disables the ability for synths to state laws if they attempt it during the downtime.
If a synth attempts to state laws during telecommunication interruption it now receives a clear feedback message about its impossibility.
Fixes runtime errors when AIs uses shortcut keys to operate APCs/turret controls when the corresponding window isn't open.
Adds missing AI-restriction check for turret controls.
Airlocks no longer lie about dropping bolts when they cannot be dropped.
2014-11-06 15:36:02 +01:00
PsiOmega
77c52f48a8 Newscaster and photo cleanup
Synthetics can no longer magically print color images on a black-and-white photocopier.
No longer possible for organics to acquire a synth-image by un-attaching it from a newscaster.
News articles now come with a timestamp and photo captions, if anything was penned on an attached photo.
Reception-checks no longer unconditionally sleeps the thread. Was causing havoc with NanoUI.

Misc. code refactoring.
2014-11-06 13:28:17 +01:00
Chinsky
8078ffe079 Merge pull request #6939 from PsiOmegaDelta/VerbOptimization
Verb optimization
2014-11-05 23:23:56 +03:00
PsiOmega
0f55842d0b Even less tapping.
Synths replying to messages through their PDA log or chat window should no longer cause the tapping message to appear.
Unsure if pAIs ever tapped, risk now greatly reduced.
2014-11-05 21:19:21 +01:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Chinsky
8451802dc7 Merge pull request #6933 from PsiOmegaDelta/News
Fixes #6747
2014-11-05 09:20:35 +03:00
PsiOmega
a9ef2b61c0 Wiring Upgrade
Continues the wiring upgrade. Now cameras, airlocks, robots, and air alarms also use the new wire datum system.
Global wiring code is now removed but there are sneaky objects which didn't rely on them such as mulebots and autolathes.

Fixes a few issues from the previous upgrade.
2014-11-04 14:27:46 +01:00
PsiOmega
2a5e685e6e Fixes #6747
Channel names are already HTML-stripped on creation. Removes second HTML-stripping when attempting to post a new story as this appears to break name comparison later.
PDAs should now properly display stories with newlines.
2014-11-03 10:39:51 +01:00
ccomp5950
9363af2a09 "Exploit Menu" uplink fix.
Double quotes will no longer break the json nanoui uses to display the data.

This fix removes the ability to use html and javascript (exploitable for nefarious reasons)

Specifying exactly what we want instead of assigning nanoui_data["exploits"] = L.fields
which passes by refernce instead of by value.

It allows us to also sanitize the input so everything that gets displayed in nanoui doesn't have html
2014-11-03 01:15:44 -05:00
mwerezak
a33fd1a2c6 Merge remote-tracking branch 'upstream/dev' into fire-extinguishers 2014-11-02 10:33:16 -05:00
Ccomp5950
9e1dfa2d97 Merge pull request #6919 from mwerezak/custom-loadout
Custom loadout updates
2014-11-01 22:29:24 -04:00
mwerezak
97bdcca033 Fixes bad handcuff check 2014-11-01 17:02:54 -04: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
mwerezak
5372b526a1 Merge remote-tracking branch 'upstream/dev' into fire-extinguishers 2014-10-31 20:29:00 -04:00
PsiOmega
f8ead9139a (De)constructable emergency shutters.
Can now construct emergency shutter assemblies from metal sheets, same as door assemblies.
Requires air alarm circuits to complete, rather than airlock circuits.
2014-10-31 13:35:48 +01:00
mwerezak
e7dcda13de Adds feedback when handcuffs cannot be placed, fixes robot cuffs. 2014-10-30 20:13:01 -04:00
Chinsky
5404a18045 Merge pull request #6886 from PsiOmegaDelta/ShoppingList
Uplink Shopping List
2014-10-30 22:13:39 +03:00
Chinsky
53aa85fa08 Merge pull request #6887 from Glloyd/fixes
Fixes #5796
2014-10-30 22:13:08 +03:00
PsiOmega
253fcc4551 Uplink Shopping List
At round end players are presented with how which items a given traitor/mercenary team bought, and how much they spent.
2014-10-30 08:49:50 +01:00
Chinsky
3ab3f86239 Merge pull request #6875 from MagmaRam/dev
Updated EVA and atmos manuals to match recent game changes.
2014-10-30 00:10:59 +03:00
Graham Lloyd
d79c0285d4 fixes #5796 2014-10-29 17:03:17 -04:00
MagmaRam
b12674c18c Changed phrasing about pressure with full oxygen internals as suggested by mwerezak.
Fixed typo pointed out by Glloyd.
2014-10-29 01:49:28 -04:00
Chinsky
541d878d54 Merge pull request #6865 from PsiOmegaDelta/PDA
PDA newscast reception
2014-10-29 06:30:54 +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
MagmaRam
04c3cb13d3 Updated EVA and atmos manuals to match recent game changes. 2014-10-28 17:10:56 -04:00
PsiOmega
e0796caf56 Fixes #6871. Fixes #6821.
Amended to match the formatting in #6846, to hopefully avoid merge issues.
2014-10-28 18:46:11 +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
e2a7710491 The AI now has a radio channel for its private frequency. 2014-10-26 22:44:19 +01: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
8e3861141c Merge branch 'dev' into PowerTwo
Conflicts:
	code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
Zuhayr
8d9d83d5ef Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-24 09:12:02 +10:30
PsiOmega
8e385c77d0 Generalizes the telecommunication reception check.
Also happens to fix a bug where a Detomax could blow up PDAs without reception.
Changes a couple of type checks to access checks.
2014-10-22 16:14:43 +02:00
GinjaNinja32
5b7cb1f117 Fix AI PDA showing tap messages 2014-10-21 16:46:48 +01:00
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
Chinsky
3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm
2014-10-20 04:52:45 +04:00
Chinsky
61e50ab72a Merge pull request #6790 from mwerezak/robot-radio
Fixes robot radio component not using power
2014-10-20 03:53:10 +04:00