Commit Graph

491 Commits

Author SHA1 Message Date
PsiOmega
7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
PsiOmega
3d9d05afce Fixes #8107.
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
2015-03-19 21:33:58 +01:00
Zuhayr
961272817f Merge pull request #8461 from comma/biofluff
Added support for multiple cloning vats per single console.
2015-03-18 02:55:05 +10:30
PsiOmega
7f68403ae4 NanoUI - Silicon law manager
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
Chinsky
ba18611bb3 Added support for multiple cloning vats per single console.
On spawn, console will attempt to connect to all unconnected cloning vats.
You can change what console connects to which pod with multitool.
2015-03-13 13:21:19 +03:00
Chinsky
ca0f08c30a Merge pull request #8331 from PsiOmegaDelta/PDATrack
The AI now have the ability to track senders of PDA messages.
2015-03-03 10:21:06 +03:00
PsiOmega
b82df37159 The AI now have the ability to track senders of PDA messages.
Can only track the original owner of a PDA.
Cannot track the senders/receivers of intercepted messages.
All other tracking conditions apply (camera coverage, no agent ID, etc.).
2015-03-01 20:55:27 +01:00
Chinsky
7f01af6b7d Merge pull request #8297 from PsiOmegaDelta/CameraCoverage
Camera coverage fixes.
2015-02-27 13:11:21 +03:00
PsiOmega
7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm
2015-02-27 09:06:48 +01:00
PsiOmega
98f6a4cae5 Camera coverage fixes.
Fixes issues with AI cameras coverage not updating properly in several instances during EMPs, destruction, etc.,
2015-02-26 11:39:41 +01:00
PsiOmega
afb7f7eff7 Fixes #8223.
Restores a lost, somewhat important, line.
Fixes a duplicate uplink item reference.
2015-02-24 12:27:03 +01:00
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
GinjaNinja32
e47c45591c Fixes a few issues with noise-language. 2015-02-23 18:58:41 +00:00
mwerezak
6c4d16774f Merge remote-tracking branch 'upstream/dev' into mercenary
Conflicts:
	code/game/objects/items/devices/uplinks.dm
2015-02-22 20:44:43 -05:00
mwerezak
c317fb8c39 Adds ability for uplink purchases to produce more than one item 2015-02-22 20:17:18 -05:00
Chinsky
79917d57b2 Merge pull request #8187 from PsiOmegaDelta/SyndicateDescriptions
Rudimentary uplink descriptions.
2015-02-22 11:32:49 +03:00
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
PsiOmega
4c8bf16628 Rudimentary uplink descriptions. 2015-02-21 10:16:47 +01:00
Chinsky
81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths
Adds robot synths
2015-02-21 11:43:39 +03:00
Kelenius
1c1e644f29 Adds robot synths 2015-02-19 21:04:27 +03:00
Zuhayr
ae1161184c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-18 14:17:39 +10:30
Hubblenaut
5eca5d9e37 Merge remote-tracking branch 'upstream/dev' into sprites
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2015-02-16 16:16:30 +01:00
Zuhayr
5e87b21d44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-14 09:32:17 +10:30
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
Zuhayr
08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +10:30
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
Zuhayr
402987edc3 Merge with dev. 2015-02-07 14:44:55 +10:30
Zuhayr
2d1fd2dd2f Added report printing for plant scanners. 2015-02-04 10:53:09 +10:30
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
Hubblenaut
70db186a38 Merge branch 'sprites' into dev
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2015-01-30 16:31:32 +01:00
Chinsky
b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
Hubblenaut
44f9b96960 Adds on-sprite belt icons 2015-01-29 18:31:09 +01: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