Commit Graph

3880 Commits

Author SHA1 Message Date
Atlantiscze
3003777b6a Adds mwerezak's suggestions
- Power monitor is now /computer/ subtype
- Different rounding of values in power monitor display
- Unfortunately, PDA power monitoring for engineers is broken and probably won't be fixed as it relies on old powernet monitoring computers. Laptops work OK
2014-11-20 16:24:26 +01:00
Atlantiscze
78a4b424ae Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 10:55:33 +01:00
Chinsky
af6a262a2c Merge pull request #7059 from PsiOmegaDelta/Headsets
Dynamic Headset Description
2014-11-20 02:41:08 +03:00
Ccomp5950
088c86f692 Merge pull request #7065 from Zuhayr/combitool
Added combi-tool.
2014-11-19 08:37:15 -05:00
Zuhayr
660b32629e Merge resolution. 2014-11-19 23:19:33 +10:30
Zuhayr
cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
Zuhayr
0f0bca6889 Merge pull request #7038 from mwerezak/diona-scream
Fixes #7026
2014-11-19 23:11:50 +10:30
Zuhayr
c11cb65e19 Added combi-tool. 2014-11-19 23:04:09 +10:30
Atlantiscze
61990872d8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-19 13:15:40 +01:00
PsiOmega
45c5f01363 Dynamic Headset Description
Headsets now generate a description of available radio channels based on the installed encryption key(s).
Currently only updates on creation, not when changing encryption keys, to ensure that less than legal keys are not detected by a mere casual glance.
2014-11-18 18:43:12 +01:00
PsiOmega
f7bc35f333 Binary Tracking
The AI can again finally track entities using the binary channel.
2014-11-18 12:24:54 +01:00
mwerezak
af8da7de03 Adjusts glass sheet construction menu input 2014-11-16 22:30:07 -05:00
Chinsky
ce3618a200 Merge pull request #6987 from MagmaRam/labcoat
Reworked labcoat buttoning
2014-11-17 04:17:16 +03:00
mwerezak
9eb6dfdef4 Fixes #7026
Uploads species var from human to carbon mobs.
2014-11-16 14:43:38 -05:00
MagmaRam
cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat
Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.
2014-11-16 02:56:32 -05:00
GinjaNinja32
d10311befd Adds cyborg-only latejoin spawnpoint 2014-11-14 23:38:09 +00:00
Chinsky
43ee395c48 Merge pull request #7013 from Raptor1628/dev
ERT Update
2014-11-14 11:18:50 +03:00
Chinsky
1640b0a1c1 Merge pull request #7015 from Zuhayr/attackverbremoval
Attack proc removal/refactor.
2014-11-14 11:18:43 +03:00
Zuhayr
31b6cc19ad Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything. 2014-11-13 21:41:02 +10:30
Zuhayr
4bb4145f5d Readded interactions for slimes and monkeys using attack_generic proc. 2014-11-13 19:18:34 +10:30
Atlantiscze
efcfa5199b Robot analyzers can now be placed into tool belts. 2014-11-13 08:42:55 +01:00
Zuhayr
4090f04839 Readded monkey dexterity checks in each attack_hand as appropriate. 2014-11-13 17:46:37 +10:30
Zuhayr
90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
Raptor1628
ba12d87388 ERT Update
Bevy of ERT changes and updates, outlined in a forum thread here:
2014-11-13 01:28:15 -05:00
mwerezak
ab2b4608e0 Fixes #6702 and cleanup
Makes reinforced glass a subtype of glass, cleans up window creation copypasta.
Cleaned up window initialization leaking outside of the window constructor.
Removes unnecessary init_dir var from windows.
2014-11-12 20:09:04 -05:00
MagmaRam
4794898cec Fix for jobs that were spawning with the old labcoat types rather than the new ones, as well as lockers that were. 2014-11-12 18:48:47 -05:00
Chinsky
f322a6af5e Merge pull request #6992 from PsiOmegaDelta/BodyBag
Shapely body bags.
2014-11-12 23:45:36 +03:00
Chinsky
70f808a8c9 Merge pull request #6991 from PsiOmegaDelta/SafeInMyCloset
No more sleeping in closets
2014-11-12 23:44:35 +03:00
Atlantiscze
835d04290c Modifications to sensors code
- More stuff now triggers powernet warnings: People getting shocked by machinery (primarily door, but can be anything else powered by APC), and grilles. Thanks to @mwerezak for suggestion.
- Monitoring computer now has slightly different icon_state when it detects powernet warning. This is checked and updated every 5 MC ticks (ie, slightly delayed)
- Fixes ocassional runtime in powernet_sensor.dm
- Powersinks buffed a bit more. Drain rate changed from 0.6MW to 1MW. 1MW is full output of main engine SMES.
- Powersinks also dissipate small amount of internal energy charge over time. (20kW)
2014-11-12 14:54:56 +01:00
Atlantiscze
f29cd211e6 Implements better powernet warning system (as suggested by mwerezak) 2014-11-12 12:33:23 +01:00
Atlantiscze
ddaac3e175 Powernet Sensor
- Adds remote powernet sensors, power monitoring computers use these by default to monitor power around the station. Default range is 1 Z level + long range versions of sensors
- Powernet sensors mapped in, each subgrid has it's own one (ie: substations compatible)
- Telecomms, mining, research and engineering outposts have long range versions installed, visible even cross-Zlevels
- Powersinks and ninja gloves now trigger problem warning in powernets they affect. This warning is visible to anyone using power monitoring console. TODO: Add more stuff that triggers warnings.
- Powersinks now properly drain APC cells using CELLRATE (@2000W per APC max.)
- Powersinks buffed a bit, to compensate for CELLRATE change (previous line)
2014-11-12 07:07:08 +01:00
MagmaRam
d09d8cf921 Apparently the blue lawyer jacket didn't actually button up properly. Now it should button up, and uses the same system as everything else. 2014-11-11 12:47:02 -05:00
MagmaRam
3e5117e3eb All coats that can be buttoned are now subtypes of /obj/item/clothing/suit/storage/toggle
This includes labcoats, IA jackets, first responder jackets, and the brown leather jackets.

This way, code for button toggling doesn't have to be duplicated for labcoats and other coats, and it's easier to add other types of coats that can be buttoned up if someone wants.
2014-11-11 11:27:11 -05: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
PsiOmega
0f47a615e3 No more sleeping in closets
Removes the 2-tick sleep cause by every closet in New().
Moves the code that sucks up items into closets to initialize() to avoid processing still null objects.
2014-11-11 11:07:05 +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
Chinsky
5f3f1c64eb Merge pull request #6946 from TwistedAkai/dev
Add Window Dismantling
2014-11-07 03:49:01 +03:00
Chinsky
1cfb49c141 Merge pull request #6954 from MagmaRam/coat
Adds alternate CMO labcoat, with blue trim. It's in the CMO's locker as ...
2014-11-07 03:45:30 +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