Commit Graph

463 Commits

Author SHA1 Message Date
PsiOmega
d4ae710c0c Tweaks and corrections. 2015-02-12 21:11:38 +01:00
PsiOmega
49b1280b13 Tries to add more helpful information when examining a spy bug from real up close. 2015-02-11 21:39:42 +01:00
PsiOmega
8ceaa8b5a1 Traitors can now order a spy kit
Traitors can now order a spy kit containing 3 camera+radio bugs + a monitor for 2 telecrystals.
2015-02-10 19:33:02 +01:00
GinjaNinja32
538ee11cb1 pAI rework 2015-02-09 01:58:54 +00:00
PsiOmega
566f6a104e Carded AIs can no longer access cameras through camera consoles.
Also includes fixes for hidden uplinks.
2015-02-03 23:44:35 +01:00
Chinsky
95eacd2185 Merge pull request #8008 from volas/sanitize_procs
Fixes for some sanitize moments
2015-02-03 15:08:47 +03:00
D Anzorge
abeb634d01 Make borg radio window tell if loudspeaker is on 2015-02-02 16:27:14 -05:00
D Anzorge
609f9848bc Fix borg radio weirdness
Borg radio interface toggling was backwards: when usr got the message that the subspace mode was
disabled, the radio would actually enter subspace mode.
2015-02-02 16:27:14 -05:00
volas
8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
Chinsky
b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
ccomp5950
44a9a722d0 Removed unused code that was intended for a different implenetation. 2015-01-25 07:21:14 -05:00
ccomp5950
89652ae5e3 JSON caching for nanoui
You get to cache data, make the best of it.

NanoUI for PDA now won't shove the manifest through list2json every tick, it will cache the json for manifest and shove it into the cache_data so list2json tacks it onto the end.
2015-01-25 06:22:30 -05:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
ccomp5950
2816d3c02b Fixes PDA locking up after receiving a " in conversation.
Long story short, the json encoding doesn't know how to handle "
Adding a check specifically for it breaks other stuff, after banging my head against it for an hour
this is the best means of fixing the problem without breaking and fixing a lot of other things.
2015-01-09 22:27:15 -05:00
Atlantiscze
2580db82b5 Removes debug statement
- Forgot to add this into my previous commit.
2015-01-01 07:54:04 +01:00
Atlantiscze
a17656086c Fixes #7349
- This fixes missing powernet sensor entries in engineer PDAs.
- This is done by reimplementing old system, that instead connected to consoles. Bleh.
- New system connects directly to sensors, but offers only very limited amount of information (ie. console is 5x better and nicer, this is intentional before someone begins yelling it's a bug!)
2015-01-01 07:52:44 +01:00
Chinsky
fe403d013b Merge pull request #7583 from atlantiscze/cellrate-hardsuit-stuff
Hardsuit Powersink Adjustments
2014-12-31 08:17:20 +03:00
Atlantiscze
a9e1f920fd Powersink Load Fix
- Apparently i forgot to add check for used amount of power when reworking powersink, causing it to drain 2kW from each APC, even above drain cap.
2014-12-29 20:36:50 +01:00
Atlantiscze
07b5b7af8b Updates references
- Changed referenced to old blastdoor type to new type, removing compile errors
- Fixes small issue in blast door file which caused compile error
2014-12-27 00:03:20 +01:00
PsiOmegaDelta
d1758a7162 Merge pull request #7510 from Zuhayr/mutantrace
Gibber fixes/refactor, mutantrace refactor, couple of small fixes.
2014-12-24 17:29:39 +13:00
Zuhayr
bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
ccomp5950
3ba1b18b8f Most PDA's now are set to silent on news updates.
resolves #7454

Heads and Librarian(reporter) are not set to silent.  The librarian can shush herself.
old bitty.
2014-12-22 21:44:26 -05:00
Mloc
5895615f72 Merge pull request #7377 from Amunak/ref
Research and circuit boards refactoring and improvements. Explosive can no longer be planted on webbing. Also some other stuff.
2014-12-18 22:29:35 +00:00
Mloc
66cb91d281 Merge pull request #7280 from Neerti/12_7_14_holopad_and_emotes
Adds see_emote(), other cool things.
2014-12-18 22:10:54 +00:00
Amunak
d28cb57f79 Merges upstream/dev to ref, resolves merge conflicts 2014-12-18 03:44:28 +01:00
Amunak
4882074739 Code formatting, EOL at EOF fixes, refactoring 2014-12-18 03:11:49 +01:00
Amunak
edffbc680d Fixed capitalization of most game items 2014-12-18 03:10:36 +01:00
PsiOmega
3a2aed265b Fixes #7374.
Now checks the correct ringer flag when receiving a PDA message.
2014-12-10 20:25:03 +01:00
Neerti
c90e9eb931 More merge conflict resolution goodness. 2014-12-10 02:14:58 -05:00
Zuhayr
90f5da4e83 Merge pull request #7333 from PsiOmegaDelta/RadioWiresAreNotForYou
Fixes #7323.
2014-12-10 03:15:28 +10:30
Zuhayr
61cb862690 Merge pull request #7300 from PsiOmegaDelta/RoundEnd
Fixes #7295.
2014-12-10 03:11:38 +10:30
PsiOmega
239eb2a0e8 Fixes #7323.
pAIs no longer check and cut wires when interacting with radio functionality.
2014-12-09 09:10:49 +01:00
Neerti
4fcd9e6924 Resolves conflicts, I hope. 2014-12-08 20:46:55 -05:00
Ccomp5950
4d615fc294 Merge pull request #7271 from Segrain/dev-freeze
Dev-freeze fixes.
2014-12-08 20:40:02 -05:00
Neerti
e1babe281a Fixes AI cards/mechs, with least bad method. 2014-12-08 20:14:55 -05:00
PsiOmega
87998f7eb1 Fixes #7295.
Cleans up round end summary.
Removes duplication of traitor summaries.
Attempts to improve how the traitor purchase log is presented.
Ghosts made manifest now have different names and assignments, otherwise one would get messages like "Anguished Phantom played as an Anguished Phantom".
Instead the message is "Anguished Phantom played as a Manifest Ghost".
2014-12-08 17:06:36 +01:00
Segrain
7f1b5f0603 Fix for #7285. 2014-12-08 11:20:46 +03:00
Neerti
9e9c297b2e Begins work,
Holopads can receive and send emotes.
The AI, when using 'me', will check if a holopad is being used.  If so, the holopad will output the emote.  If not, it's outputted from the core.
The AI will hear emotes from near an active holopad.
There is a new obj verb called 'see_emote()', that works similarly to hear_talk().
custom_emote() modified to have 'seeing_obj' list.  May be resource-intensive, not sure.
pAIs can now hear emotes, without issue.
Carded AIs can hear emotes, but they hear themselves twice.
Mechs do not hear emotes correctly at this time.
2014-12-07 23:03:42 -05:00
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Zuhayr
b30be0a352 Fixes #7199 2014-12-07 22:13:31 +10:30
Zuhayr
958eb62ed5 Refactors a lot of reused/redundant death code, fixes #7224 2014-12-07 17:18:56 +10:30
PsiOmega
1f9cb08102 Syndicate borg code refactoring.
Refactors the borg syndicate code to be more accessible to adminbus.
Syndicate borgs have a jetpack module.
Overrides canUseTopic() to limit what the Syndi-borg can interact.
Still has all access, may be more limited in the future if Bump() is refactored /tg/ style. Admins: Spawn with care.
2014-12-04 12:56:29 +01:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega
8ae93e2616 Radio fixes
Intercoms no longer have to check wiring, they can simply use the listening/receiving flags.
Can no longer enable reception/broadcasting if the relevant cables have been cut.
2014-11-27 17:10:26 +01:00
PsiOmegaDelta
fae43793a4 Merge pull request #7142 from PsiOmegaDelta/Singularity
Syndicate beacon power consumption and objective.
2014-11-26 22:08:48 +01:00
Chinsky
ee815b719e Merge pull request #7129 from PsiOmegaDelta/Wires
Wires
2014-11-27 00:02:39 +03:00
PsiOmega
d6c0ebf138 Syndicate beacon power consumption and objective.
Cleans up syndicate beacon power consumption.
Objectives are now only given if not disabled.
Relative-proc cleanup.
2014-11-26 09:56:15 +01:00
GinjaNinja32
48343a23fb Fix most nullspace items, rewrite floor tiles not to del() on every place/remove 2014-11-24 17:05:46 +00:00
PsiOmega
1e479536db Radio wires. 2014-11-24 10:19:57 +01:00