Commit Graph

13325 Commits

Author SHA1 Message Date
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
Datraen
8eaf6804e6 Fixes #685. 2016-01-08 18:13:47 +01:00
Chinsky
1c0ca68904 Now only removing one stump per replacement.
Which limb creates which wound isn't tracked anywhere, but eh, as long as number of stumps is sane.
2016-01-08 19:41:48 +03:00
PsiOmegaDelta
2c1debbcaa Logging tweaks.
Uploading a new library book now also gives an admin notice.
Admin logs will now add a (JMP) if at all applicable.
2016-01-08 15:22:43 +01:00
PsiOmegaDelta
afd526126d Fire extinguisher fixes and tweaks
Port of https://github.com/PolarisSS13/Polaris/pull/713.
2016-01-08 14:47:18 +01:00
Hubblenaut
a89c066905 Fixes onmob icons for holders
Conflicts:
	code/game/objects/items.dm
2016-01-08 14:47:08 +01:00
Dibasic
e9dac928b0 Cold air shiver typo fix 2016-01-08 14:46:58 +01:00
PsiOmegaDelta
f9b61ed1ec Merge pull request #11943 from Baystation12/dev-freeze
Dev
2016-01-08 14:27:32 +01:00
PsiOmegaDelta
cf463ffd48 Merge pull request #11942 from Baystation12/master
Dev-freeze
2016-01-08 13:59:21 +01:00
PsiOmegaDelta
8ea8c342bc Merge pull request #11940 from comma/pixelhunt
Makes inventory slots forward clicks to items in them
2016-01-08 13:37:47 +01:00
PsiOmegaDelta
596bcdf55f Merge pull request #11938 from atlantiscze/2016-01-07-MultiThreading
Modular Computer Multitasking + Fixes
2016-01-08 13:37:25 +01:00
Chinsky
f569d55527 Merge pull request #11911 from Kearel/modificationsAndFixes
Modifications to actor verb, orion trail, and board game.
2016-01-08 09:21:03 +03:00
Chinsky
4de4cac9be Makes inventory slots forward clicks to items in them. In effect that means you don't have to pixelhunt item in the slot, just click the slot. Smoking cigs is easy mode now. 2016-01-08 09:08:44 +03:00
Atlantis
409a832646 Fixes #11931 + Design bug
- NTNRC conversations are now rather matched by Unique ID that's assigned on New(), rather than name. This has a nice side effect of being able to have conversations that share names.
- Tweaks design datums a bit. Renames "processor unit" to "computer processor unit", etc. since i noticed telecomms machine already uses "processor unit" name. Also corrects duplicated ID.
2016-01-08 01:55:56 +01:00
Atlantis
265c0d2567 Modular Computer Multitasking + Fixes
- Modular computers now support multitasking.
- New hardware type added. Basic CPUs may be obtained when purchasing a laptop or tablet, Photonic CPUs can be printed at research at imprinter. This hardware piece determines how many programs can be on background.
- Programs can now have an icon that is rendered in main UI's header (along with the power icons, etc.) when the program is on background. As an example, these icons have been added to NTNRC client (Dark icon when no messages have been received, blinking when new message is waiting), Alarm monitor (Blinking red when an alarm is active, green otherwise) and downloader program (Animated arrow when downloading, stationary when finished.)
- Adds missing crew monitor icon to tablets. Fixes #11937
2016-01-08 01:34:30 +01:00
Techhead0
77ecaac36b Quick fix for #11772
Changes character setup to use species' bodytypes to determine hairstyle availability.
2016-01-07 17:01:25 -05:00
Chinsky
41971d9273 Added check for battery power 2016-01-07 23:21:25 +03:00
Chinsky
46bcfd96f8 Changes to limb reattachment - now when limb is attached, wound from it not being there is removed. Because you know, it's there now. No more bleeding stumps with limbs already attached.
Also fixes limbs instahealing when cut / reattached. Wounds used to be Cut() to prevent fantom wounds but, it's not needed anymore because whole limb is removed.
Also moved moving organs inside replaced() since it was called next to it anyway, and not like you can replace  organ without moving it to human. Also forceMove()
2016-01-07 23:10:02 +03:00
Chinsky
53e1fb016e Failing to find a valid surgery step now doesn't prevent attack() from running.
It is now possible to inject / bandage / healthanalyze patients on help intent.
2016-01-07 21:57:26 +03:00
Chinsky
8471813406 Adds a handheld mirror that can change hairstyles. 2016-01-07 21:17:31 +03:00
Ccomp5950
97c0635fad Merge pull request #11927 from comma/devfix
Devfixes
2016-01-07 13:03:26 -05:00
Chinsky
f885aba1c9 Added standby icon to powered modular consoles. Sprites by Hubblenaut 2016-01-07 20:46:10 +03:00
Chinsky
7b4289e072 Macro for intent 2016-01-07 19:40:50 +03:00
Atlantis
cbcd5ab035 Map fixes - Dev Edition
- See #11658 - this is just edition for Dev
- TLDR version: Fixes power alarm at construction site, fixes emitter button giving errors about not being connected to cable, unanchors emitters at mining outpost by default.
- Added subtype for inactive APCs as per PsiOmegaDelta's request
- Fixed gridcheck affecting telecommunications central compartment.
2016-01-07 12:34:38 +01:00
Chinsky
f7b0f2796e Merge pull request #10095 from RavingManiac/dev-2
Capacity-based storage system
2016-01-07 07:17:10 +03:00
Chinsky
0d7c52b869 Fixes #11884 2016-01-07 07:07:45 +03:00
Chinsky
f0678854ec Fixed monkey scooping. Again. 2016-01-07 07:06:20 +03:00
Chinsky
e9991c99ae Fixes #11916 2016-01-07 05:47:51 +03:00