Commit Graph

13355 Commits

Author SHA1 Message Date
PsiOmegaDelta
bee18a16db Tweaks.
Re-uses the too_many_active_drones() proc as originally intended.
Makes the private_valid_special_roles list global, no need to let each individual player initialize the list.
2016-01-15 12:03:45 +01:00
PsiOmegaDelta
12fe589dce Adds the necessary infrastructure to not have to trust the href request timeout for ghost trap requests.
Skips unregistering.
2016-01-15 11:42:07 +01:00
PsiOmegaDelta
b74f2baf6d Makes special role preferences a list, instead of flag entry.
Allows us to define more than 16 special roles.
Updates some role usages to use the new ghost trap system.
2016-01-15 11:34:00 +01:00
Ccomp5950
d726941d5c Merge pull request #11981 from PsiOmegaDelta/160114-PolarisDev
Tweaks and fixes MKII
2016-01-15 00:33:36 -05:00
Ccomp5950
d34e30a915 Merge pull request #11975 from PsiOmegaDelta/160112-PublicToggle
Adds verb to toggle hub visibility.
2016-01-14 03:21:41 -05:00
GinjaNinja32
32ee8d7ee8 Merge pull request #11979 from PsiOmegaDelta/160113-Changelog
Tweaks and changelog.
2016-01-14 08:19:19 +00:00
Zuhayr
eec1c9a32a Applying Harpy's prosthetic limb damage fix.
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
2016-01-14 08:54:56 +01:00
Jon
6e931d0125 Fixes mask coverage. 2016-01-14 08:44:43 +01:00
Zuhayr
4b356f5a36 Robotic limbs and non-DNA mobs will now respect gendered icons.
Conflicts:
	code/modules/organs/organ_icon.dm
2016-01-14 08:44:21 +01:00
PsiOmegaDelta
e745093acc Corrects snack macros. 2016-01-14 08:42:24 +01:00
Zuhayr
cc4c86c995 Fixes #270 2016-01-14 08:37:10 +01:00
Zuhayr
d9a27133bd Fixes #260 2016-01-14 08:36:42 +01:00
Zuhayr
8da41d6bca Fixes #676 2016-01-14 08:36:06 +01:00
Zuhayr
ba6d684e96 Adds [dock_name] entry used by shuttles.
Conflicts:
	code/controllers/emergency_shuttle_controller.dm
	code/global.dm
	code/modules/shuttles/shuttle_emergency.dm
2016-01-14 08:33:22 +01:00
ccomp5950
d316e34b61 Fixes deadmin popup.
You can too re-admin yourself...I wrote that shit.
2016-01-13 23:00:47 -05:00
PsiOmegaDelta
8b60de9c65 Merge remote-tracking branch 'upstream/dev' into 160112-PublicToggle
Conflicts:
	baystation12.dme
2016-01-13 10:14:51 +01:00
PsiOmegaDelta
2d978abfef Adds a space. 2016-01-13 09:08:28 +01:00
PsiOmegaDelta
ffe31d0414 Replaces an incapacitated(flag) check with the appropriate method instead. 2016-01-13 08:25:00 +01:00
PsiOmegaDelta
4f6ebf9a43 Adds a config option to automatically delist the server from the BYOND up when there are no admins. 2016-01-13 08:05:49 +01:00
Atlantis
75e40d7748 Modular computer fixes
- Tesla link is now correctly enabled when being installed into a console. Fixes #11974
- Tesla link now correctly stops using power when the computer shuts down.
- Configurator program now uses much better method to obtain list of components. This method takes into account possible hardware additions in the future.
2016-01-12 23:57:36 +01:00
Neerti
c3586712e5 Adds verb to toggle hub visibility.
Conflicts:
	code/modules/admin/admin_verbs.dm
2016-01-12 18:02:00 +01:00
GinjaNinja32
d04bef2991 Merge pull request #11973 from atlantiscze/2016-01-12-SMESfix
SMESs will no longer turn themselves off when they run out of power
2016-01-12 15:47:22 +00:00
Atlantis
95ea641714 SMESs will no longer turn themselves off when they run out of power
- Instead, they simply won't output until some power is regained.
- This prevents, for example, solar SMESs from shutting down when they reach zero charge when the array is shadowed by the station. The SMES simply won't output any power until the array begins generating again.
2016-01-12 16:35:17 +01:00
Ccomp5950
56b4982034 Merge pull request #11873 from PsiOmegaDelta/160102-Yona
Tweaks and fixes.
2016-01-12 10:28:30 -05:00
Zuhayr
7439b7bcf4 Attempting to fix perma-wet-floors bugs. 2016-01-12 08:59:59 +01:00
GinjaNinja32
83f22da2e6 Merge pull request #11957 from PsiOmegaDelta/160110-ProcessedEvents
Event manager tweaks.
2016-01-11 17:15:07 +00:00
PsiOmegaDelta
e90bfad7de Merge pull request #11935 from comma/wounds
Limb reattachment heals missing limbs now
2016-01-11 17:37:25 +01:00
PsiOmegaDelta
2740858cfe Merge pull request #11934 from comma/malpractice
Can use items on roller/optable people on help intent
2016-01-11 17:37:15 +01:00
GinjaNinja32
3aa3073f51 Merge pull request #11964 from GinjaNinja32/dev
dev...dev-freeze
2016-01-11 07:59:05 +00:00
GinjaNinja32
87f645a267 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2016-01-11 07:51:07 +00:00
GinjaNinja32
d1dfcd7a40 Merge pull request #11961 from atlantiscze/2016-01-11-metal-is-not-steel
Fixes incorrectly set entry for steel in Circuit Imprinter
2016-01-11 07:47:55 +00:00
PsiOmegaDelta
9b449cc183 Merge pull request #11963 from Baystation12/master
Dev-freeze
2016-01-11 08:28:56 +01:00
Atlantis
17aa6087a0 Fixes incorrectly set entry for steel in Circuit Imprinter 2016-01-11 06:44:28 +01:00
GinjaNinja32
a00a6ae0e6 Fix #11955 2016-01-10 22:12:12 +00:00
PsiOmegaDelta
b1fea3b090 Event manager tweaks.
Moves the event manager processing into the process itself.
Ensures the last_object var is properly set in case of issues.
Also fixes a potential risk of the camera damage event looping forever.
2016-01-10 21:18:20 +01:00
GinjaNinja32
4ee1f0b874 Merge pull request #11954 from PsiOmegaDelta/160110-RuntimeTheLessEternal
Runtime is now less spooky while dead or otherwise incapacitated.
2016-01-10 15:43:42 +00:00
Chinsky
c6e31a1fef Merge pull request #11952 from Techhead0/ShippingError
Adds the "Shipping Error" random event.
2016-01-10 18:35:41 +03:00
Chinsky
cc6dbc1815 Merge pull request #11951 from Ccomp5950/fix_vision_shit
Meson Scanners now "see in the dark"...again.
2016-01-10 18:35:36 +03:00
PsiOmegaDelta
70d3a012dc Runtime is now less spooky while dead or otherwise incapacitated.
Fixes #11950.
2016-01-10 12:57:04 +01:00
PsiOmegaDelta
de81681f91 Merge pull request #11932 from comma/screensaver
Added standby icon to powered modular consoles.
2016-01-10 12:26:23 +01:00
Techhead0
ec805ef9f5 Adds the "Shipping Error" random event.
Adds a new random event that puts a free random crate on the next supply shuttle.
2016-01-10 04:21:29 -05:00
ccomp5950
f2feb742ff Meson Scanners now "see in the dark"...again.
This is most likely the 4th time I've fixed this.

Fixes: #11787
2016-01-09 21:59:10 -05:00
Chinsky
6cc4c26560 Merge pull request #11944 from PsiOmegaDelta/160108-PolDev
Various fixes.
2016-01-09 23:39:17 +03:00
Chinsky
4c81f55d36 Merge pull request #11947 from atlantiscze/2016-01-09-PowerMonitorAlarm
Power monitor tweaks
2016-01-09 23:39:13 +03:00
Chinsky
bd5aa0cac0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into screensaver
Conflicts:
	icons/obj/modular_console.dmi
	icons/obj/modular_laptop.dmi
2016-01-09 10:25:21 +03:00
Atlantis
71a10aa218 Fixes tablets from custom loadout starting without processor installed. 2016-01-09 07:00:40 +01:00
Atlantis
9f4b5c6920 Power monitor tweaks
- Power monitor now has modular computer header icon.
- Power monitor now updates the computer's texture depending on whether there is a power network alert or not, as it used to do in the past.
2016-01-09 06:28:32 +01:00
GinjaNinja32
f7ec85e0f0 Merge pull request #11933 from comma/mirrormirror
Handheld mirror
2016-01-08 22:09:22 +00:00
PsiOmegaDelta
a83e78a648 Merge remote-tracking branch 'upstream/dev' into 160102-Yona
Conflicts:
	code/modules/modular_computers/file_system/programs/ntnrc_client.dm
2016-01-08 19:02:30 +01:00
Datraen
8eaf6804e6 Fixes #685. 2016-01-08 18:13:47 +01:00