Commit Graph

12910 Commits

Author SHA1 Message Date
Zuhayr
e2ce3fbb08 Duct tape can now be used to gag, blindfold or cuff people, and cable cuffs/duct tape can restrain rig-wearing people (poorly). 2015-12-01 02:04:10 +10:30
Zuhayr
958e11387d POCKET SAND! 2015-12-01 02:04:10 +10:30
Zuhayr
ff353fdd9b Renamed silicates to sand. 2015-12-01 02:04:09 +10:30
PsiOmegaDelta
4e89045aab Merge pull request #11451 from Loganbacca/wireless
Wireless controller for machinery connections
2015-11-27 07:59:59 +01:00
Loganbacca
3a14650dc1 Wireless controller cleanup
Changed back to count based spawn_sync failsafe
Moved toggle buttons to be a subtype
Purged unfinished wireless tool (code and icon)
2015-11-25 21:14:38 +13:00
PsiOmegaDelta
89e85925c9 Merge pull request #11516 from Baystation12/dev-freeze
Dev
2015-11-24 14:35:56 +01:00
PsiOmegaDelta
9b1123cbaa Replaces misc. checks with usr.incapacitated(). 2015-11-24 14:05:04 +01:00
PsiOmegaDelta
e67ff9e903 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-24 14:02:15 +01:00
Loganbacca
d7602a2cd5 Wireless and spawn_sync tweaks
Modified spawn_sync to include the spawning code, thus simplifying it's usage.
Modified spawn_sync to use actual time for failsafes.
A couple of sensibility tweaks for the wireless controller.
Cleaned up devices.dm to use new spawn_sync code.
Suggestions courtesy of @mwerezak

Added a changelog
2015-11-24 23:00:58 +13:00
PsiOmegaDelta
0e5fc06b13 Merge pull request #11491 from Datraen/Trayfix
Fixes Non-human, Non-synth mobs (ghosts, mice) being able to interact with trays.
2015-11-24 10:48:17 +01:00
GinjaNinja32
98c8729bb3 Merge pull request #11265 from Karolis2011/camera_fix
General camera fixes.
2015-11-23 09:29:02 +00:00
GinjaNinja32
b72cb1f45b Merge pull request #11504 from PsiOmegaDelta/151122-EMPSafeShuttle
Makes shuttle control consoles sturdier.
2015-11-23 09:28:03 +00:00
Loganbacca
da7a4a78d8 Documentation and stuff
Documentation, documentation, documentation.
Safety checks.
Reshuffled some code.
Modified wifi senders and receivers to both use var/id, instead of two different vars for basically the same purpose.
2015-11-23 21:46:29 +13:00
Bjorn Neergaard
0f78998377 Fix Dionea home system
Fixes #11492
2015-11-22 20:34:29 -06:00
Karolis2011
2ecf44a665 Removed uneceserry variable 2015-11-22 13:23:45 +02:00
PsiOmegaDelta
11db663fac Ghosts can now view any object with a NanoUI interface.
However, ghosts can now also only view objects in range to ensure that the NanoUI window count is kept low.
Admins do not suffer this restriction and may also interact with these windows.
2015-11-22 12:21:41 +01:00
PsiOmegaDelta
f74d9e6862 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
	maps/exodus-1.dmm
2015-11-22 11:48:00 +01:00
PsiOmegaDelta
26f167453c Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-22 11:40:44 +01:00
PsiOmegaDelta
782f0a8bfb Makes shuttle control consoles sturdier.
Fixes #11501.
2015-11-22 11:37:14 +01:00
PsiOmegaDelta
c5333cabea Merge pull request #11474 from comma/slipping
Refactored slipping code a little.
2015-11-22 11:19:30 +01:00
Chinsky
7082096f1d Merge pull request #11497 from PsiOmegaDelta/151121-CameraAlerts
Engineering alarm monitors now include camera alarms.
2015-11-22 13:01:34 +03:00
Chinsky
5242af4949 Merge pull request #11499 from PsiOmegaDelta/151112-Lighting
Re-adds missing lighting initializer.
2015-11-22 13:01:17 +03:00
Loganbacca
012f82fe23 Wireless control additions
Mass drivers, doors (airlocks and blast doors), igniters and sparkers, and emitters.
Sparker cleanup.
2015-11-22 22:32:52 +13:00
Loganbacca
56bf894ee1 Wireless button updates
Added toggle variants for buttons, allowing them to "deactivate" connected devices.
Converted flashers and holosigns.
Fixes to keep in line with upstream.
2015-11-22 22:32:52 +13:00
Loganbacca
750414e280 GC cleanup
Cleaned up some GC code and properly implemented it for wireless datums
Remote buttons are now fully working with emitters and crematoriums
2015-11-22 22:32:52 +13:00
Loganbacca
a9555b0175 Converted emitter remote control
Also converted crematoriums, although they are not working at the moment.
Removed redundant wireless manager file.
2015-11-22 22:32:51 +13:00
Loganbacca
c1159c8f4d Wireless controller update
Rewrote wireless controller to be a full processScheduler controller.
Added a basic wireless reconfiguration tool.
2015-11-22 22:32:27 +13:00
Loganbacca
7c994669ab Added wireless connection controller
Base framework for wireless connection controller to replace radio controller for device communication
2015-11-22 22:32:26 +13:00
Chinsky
a04613cfb0 Merge pull request #11493 from Zuhayr/dev
Fixes several issues with drones.
2015-11-22 12:31:30 +03:00
Zuhayr
055fe07054 Amending drone mob size. 2015-11-22 19:52:14 +10:30
Zuhayr
9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30
PsiOmegaDelta
cb44f202c1 Re-adds missing lighting initializer.
Fixes #11494.
2015-11-21 16:20:04 +01:00
PsiOmegaDelta
446356510a Engineering alarm monitors now include camera alarms. 2015-11-21 11:52:10 +01:00
Zuhayr
c20275ae64 Fixes minor oversight with robot icon code. 2015-11-21 16:10:57 +10:30
Zuhayr
6d15c43377 Fixes several issues with drones. 2015-11-21 15:01:43 +10:30
Datraen
301f7f5c8d Fixes #11489, fixes labels as well 2015-11-20 19:37:00 -05:00
Datraen
a79a8746e0 Fixes #11489 2015-11-20 18:30:52 -05:00
GinjaNinja32
8e1928062b sulphuric acid is "sacid" not "acid" 2015-11-20 21:41:31 +00:00
Bjorn Neergaard
6b742bd44f Add /tg/-style attack animations
Thanks to @GinjaNinja32 for some style tweaks
2015-11-20 15:45:16 -05:00
PsiOmegaDelta
c826d3d237 Fixes being unable to eat.
Silly 1-based indexing.
2015-11-20 11:21:39 +01:00
Zuhayr
959e15826b Fixes grown food not leaving trash. 2015-11-20 20:02:05 +10:30
Zuhayr
8fa345f24a Diona nymphs and fruit are now able to be holstered. 2015-11-20 19:36:15 +10:30
Zuhayr
e48a54fd85 Holsters will now show as 'occupied' on examine if something is in them. 2015-11-20 19:36:08 +10:30
PsiOmegaDelta
033708b8e6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-19 09:06:32 +01:00
PsiOmegaDelta
aa3a62fe32 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-19 08:59:24 +01:00
Chinsky
a69cbee6e9 Refactored slipping code a little.
Moved human Check_Shoegrip() override to human_movement. Parent is in mob_movement, makes sense to keep them in line imo.
Renamed Process_Spaceslipping to slip_chance because it doesn't do any kind of processing. And I hate naming of these procs.
Refactored human slip_chance override to use parent proc instead of doing same checks all over again.
Removed update_gravity (and its only call in life()) and mob_has_gravity(). First one was called precisely once and did /nothing/. Mob-level proc just returns and it is never overriden anywhere. Second one is just a call for has_gravity, meaningless and used only once in that removed line.
Refactored Check_Dense_Object (god I hate these names) to be less, for lack fo better word, retarded.
Instead of weird var for keeping number of dense objects (that is never used, check only used as binary true/false), it now just returns value when it finds a suitabl object.
Used trange and orange instead of oview to avoid fuckery in non-lit places.
2015-11-19 10:17:03 +03:00
Chinsky
a287e47c28 Merge pull request #11364 from PsiOmegaDelta/151024-Btime
Scheduler now uses btime, and other improvements.
2015-11-19 10:14:03 +03:00
Chinsky
f9e56ddb18 Merge pull request #11349 from PsiOmegaDelta/151023-Wires
Converts the nuclear bomb to the new wire system.
2015-11-19 10:11:13 +03:00
GinjaNinja32
d247584d1b add a sleep inbetween disabling and enabling hardware mode
i've been seeing HW mode not always re-enabling, hopefully this'll fix it
2015-11-18 14:38:46 +00:00
PsiOmegaDelta
4586068823 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-16 18:20:20 +01:00