Commit Graph

9009 Commits

Author SHA1 Message Date
PsiOmega
0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm
2014-11-11 14:13:02 +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
6b0049391f Merge pull request #6922 from PsiOmegaDelta/TheGreatEvents
Random Event Overhaul
2014-11-09 00:02:13 +03:00
Chinsky
82e5cf4b72 Merge pull request #6965 from PsiOmegaDelta/Supply
Service personnel radio frequency
2014-11-09 00:02:07 +03:00
Chinsky
57110b4059 Merge pull request #6961 from GinjaNinja32/phoronspecial
Fixes Toxins Special having no sprite
2014-11-09 00:00:59 +03:00
PsiOmega
574a8f5570 Completes the basic random event manager. 2014-11-08 18:22:31 +01:00
PsiOmega
bd885164f1 Merge remote-tracking branch 'upstream/dev' into TheGreatEvents
Conflicts:
	code/global.dm
2014-11-08 10:26:45 +01:00
Chinsky
79a5170325 Merge pull request #6959 from PsiOmegaDelta/StateLaws
AI fixes
2014-11-08 11:11:04 +03:00
Chinsky
90cb5f5363 Merge pull request #6962 from GinjaNinja32/drinks
Move glass appearance into reagent datums
2014-11-08 11:10:48 +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
Ccomp5950
a9f63a2094 Merge pull request #6948 from atlantiscze/power-related-multifix
[Ready To Merge] Power Multifix
2014-11-07 00:59:52 -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
13430bd48f Merge pull request #6956 from mwerezak/logo
Fixes #6941
2014-11-07 03:50:08 +03:00
Chinsky
42e2409408 Merge pull request #6942 from PsiOmegaDelta/Hacking
Wiring Upgrade
2014-11-07 03:49:38 +03:00
Chinsky
df5912eccd Merge pull request #6943 from PsiOmegaDelta/Ghosts
Manifest ghost visibility-toggle
2014-11-07 03:46:22 +03:00
Chinsky
ba0de5014b Merge pull request #6950 from PsiOmegaDelta/Ninja
Fixes #6934
2014-11-07 03:45:37 +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
mwerezak
3d7636728c Fixes #6941 2014-11-06 19:34:14 -05:00
GinjaNinja32
7d453ece1f Move glass appearance into reagent datums 2014-11-06 23:49:07 +00:00
GinjaNinja32
0e41cf9cf0 Fixes Toxins Special having no sprite 2014-11-06 21:04:14 +00: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
PsiOmega
ea874a8baa Merge remote-tracking branch 'upstream/dev' into Ghosts
Conflicts:
	code/modules/mob/dead/observer/observer.dm
2014-11-06 08:40:18 +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
MagmaRam
f922703938 Adds alternate CMO labcoat, with blue trim. It's in the CMO's locker as well as the regular (solid blue) labcoat. The CMO still spawns with the solid blue one. 2014-11-05 14:43:12 -05:00
PsiOmega
8df53693b4 Admin event panel taking shape. 2014-11-05 17:19:04 +01:00
PsiOmega
611a8113a6 Merge remote-tracking branch 'upstream/dev' into TheGreatEvents
Conflicts:
	code/modules/events/radiation_storm.dm
2014-11-05 14:37:20 +01:00
PsiOmega
ffdf4151bd Fixes #6934
The ninja mask, shoes, and gloves are no longer hidden by the helmet and suit, ensuring ninjas no longer look like enhanced space-hobos.
2014-11-05 13:25:54 +01:00
Atlantiscze
e0dd1fbfcf SMES UI fixes
- SMES now shows "Partially Charging" in UI when it has at least some input, but not enough to charge at set rate.
- Added yellowish-orange overlay which is used instead of the normal one if the SMES is partially charging, so you can visually see it without having to open the UI.
- UI input/output rate fields are now 20px wider. This fixes issues with values that exceed 1 000 000 W. Such values are possible with multi-coiled SMESs.
2014-11-05 12:55:58 +01:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Atlantiscze
8165c5db7e Magnetic gripper can now pick up magnetic coil (SMES construction part) 2014-11-05 12:11:36 +01:00
Atlantiscze
1a274475d1 Fixes SMES deconstructing yielding no parts.
- Damn you indentation.
2014-11-05 11:33:14 +01:00
Atlantiscze
a93b6313e0 Buildable SMES overload EM pulse now won't now slow other effects from happening (which was not intended and can be noticed, espicially with larger overloads.) 2014-11-05 11:21:35 +01:00
Atlantiscze
6db4b04dc0 Colored Cable Fix
- Cables are now properly colored when placing them with colored cable coil (instead of always making red cable)
- Removed duplicate definition of color (color and item_color), only var color is now used. That probably caused this issue in first place.
2014-11-05 11:12:39 +01:00
Atlantiscze
7a42102eb8 SMES interaction fixes
- Removing/adding terminals no longer shows the wrong warning messages.
2014-11-05 10:47:56 +01:00
Atlantiscze
805159a4b2 Powernet Update Fix
- Fixes issues caused when makepowernets() was somehow called.
- Substations (or read, breakerboxes) work properly now. Tested.
- Powernets no longer decide to randomly stop working when stuff is being modified.
- Mostly temporary fix until next devmerge which will (hopefully) add /tg/ powernet code.
2014-11-05 10:35:17 +01:00
PsiOmega
e19a79a340 Ports verb-optimizations from /tg/
The examine, pull, and point verbs now below to the mob instead of all atoms. Based on discussion here: http://www.byond.com/forum/?post=1326139&page=2#comment8198716
As a bonus ghosts can now point. Ghost pointing should only be visible to other ghosts unless made visible by cult activities.
2014-11-05 08:52:56 +01:00
Chinsky
ed8963eb2a Merge pull request #6876 from PsiOmegaDelta/Jukebox
Area-based Jukebox
2014-11-05 09:24:09 +03:00
Chinsky
e8b8c7ab55 Merge pull request #6931 from PsiOmegaDelta/MoreZ
More Z-level compatibility
2014-11-05 09:21:52 +03:00
Chinsky
d28d7b8c2f Merge pull request #6846 from mwerezak/fire-extinguishers
Water cools hot turfs even if they do not have a hotspot.
2014-11-05 09:03:35 +03:00
Walter0o
3c1780a301 fixes robo- and amputated limbs not working on spawn
i pulled in some patches from upstream today, then my players reported
robotic and amputated limbs are not appearing on spawn.
not exactly sure what happened here, but it looks like
somebody tried to fix one issue and created a bigger one.
organs are never in both organs_by_name and internal_organs_by_name,
so the flag setters became unreachable due to "if(!I || !O) continue"
2014-11-04 20:33:43 +01:00
PsiOmega
d9b420642a Manifest ghost visibility-toggle
Ghosts which have been made visible by cultists can afterward turn themselves (in)visible at will, with a cooldown before being able to turn themselves visible after having faded from sight.
2014-11-04 17:59:29 +01: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