Commit Graph

11404 Commits

Author SHA1 Message Date
mwerezak
6b85a13de7 Merge remote-tracking branch 'upstream/dev' into chem-kinetics
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
2015-05-30 17:25:57 -04:00
mwerezak
fd7830fd1b Adjusts most catalysts values 2015-05-30 17:21:33 -04:00
mwerezak
2d92a871aa Optimizes reaction checks 2015-05-30 17:21:05 -04:00
mwerezak
33487c76fa Implements reaction-over-time and reaction yield 2015-05-30 16:44:24 -04:00
PsiOmega
d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
PsiOmegaDelta
12d1277925 Merge pull request #9577 from Zuhayr/dev-freeze
Fixes
2015-05-30 08:35:39 +02:00
Zuhayr
eaf7e6718d Merge pull request #9553 from GinjaNinja32/reagent_protection
Fixes #5945, de-copy-pastes parapens and sleepypens
2015-05-30 13:57:31 +09:30
Zuhayr
40780165a2 Merge pull request #9569 from comma/master
Fixes corpses and unconscious people still showing typing indicators.
2015-05-30 12:36:14 +09:30
Chinsky
f61380adfc Merge pull request #9576 from GinjaNinja32/shuttle_logging
Shuttle improvements
2015-05-30 03:15:18 +03:00
Chinsky
44db730482 Fixes corpses and unconscious people still showing typing indicators.
Indicator also has same visibility as the owner, so no magicaly sensing where someone is going to talk soon (chat bubbles works well enough)
Since images do not have visibility, had to make it an object decal. Also since it's set per mob, it's no longer global. Shouldn't really be much of an issue, since it's only created when mob tries to speak (so ~60 objects total on high-usual load)
2015-05-30 03:13:45 +03:00
Zuhayr
21a019b34f Cleanup 2015-05-30 05:35:00 +09:30
Zuhayr
97cbcff3df Fixes #9124 2015-05-30 05:29:33 +09:30
Zuhayr
b67622b23c Fixes 9077 2015-05-30 05:06:43 +09:30
Zuhayr
5f2cf7b4a3 Fixes limbs and wounds not being visible on limbs. 2015-05-30 04:59:12 +09:30
Zuhayr
ce36d07f79 Fixes #9180 2015-05-30 04:58:49 +09:30
Zuhayr
4a012a90ca Fixes #8929 2015-05-30 04:38:41 +09:30
Zuhayr
6564fd6663 Messed this up. 2015-05-30 04:06:23 +09:30
Zuhayr
a4c2267984 Fixes #9386 2015-05-30 04:01:13 +09:30
Zuhayr
7b8abdab01 Fixes #9361 2015-05-30 03:55:41 +09:30
Zuhayr
c5df326533 Fixes #9414 2015-05-30 03:15:19 +09:30
GinjaNinja32
9546c8a5e1 Better shuttle override logging, span classes, \The, GetID() instead of typechecks 2015-05-29 18:31:21 +01:00
Zuhayr
887b8163cc Fixes #9498 2015-05-30 02:56:01 +09:30
Zuhayr
ac822de309 Fixes #9524 2015-05-30 02:33:41 +09:30
GinjaNinja32
daff60f8e3 Merge pull request #9563 from mwerezak/malflimb
Adjusts malfunctioning limb stance damage
2015-05-29 17:48:18 +01:00
Zuhayr
6e1d39ba2e Merge pull request #9554 from GinjaNinja32/nano_template
Fixes #6077
2015-05-30 02:16:32 +09:30
Zuhayr
fa7c43bf39 Merge pull request #9549 from atlantiscze/bright-solution
Refactor floodlights
2015-05-30 02:11:10 +09:30
GinjaNinja32
76daebe0db More consistent logging via admin_inject_log proc 2015-05-29 16:57:42 +01:00
Zuhayr
15070d729d Dev-freeze into dev merge. 2015-05-30 00:31:12 +09:30
Atlantis
477204e8c8 Fixes two newmalf-related issues
- Fixes APC runtime. I am an idiot. I know.
- Fixes potentional power issue with AI powersupply object, caused by AI having more than one powersupply. This sometimes caused AI to use 100kW instead of 50kW
2015-05-29 12:23:39 +02:00
mwerezak
ad5c5680a2 Adjusts malfunctioning limb stance damage 2015-05-28 22:57:36 -04:00
GinjaNinja32
562651a876 Fixes #8162 2015-05-28 23:11:00 +01:00
GinjaNinja32
8ed2380cee Fixes #6077
Updates nanomanager's handling of opening UIs so that it can be called multiple times, changes force_open to simply ignore that the UI is open and try to open it again. Causes a slight flicker if the UI is open, but the window does not move or change size.
2015-05-28 22:55:46 +01:00
GinjaNinja32
86f52910a1 Fixes #5945, de-copy-pastes parapens and sleepypens
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
2015-05-28 22:23:37 +01:00
Atlantis
30e4550e2e Refactor floodlights
- Fixes #9543
- Removes ugly floodlight/proc/updateicon() and replaces it with proper floodlight/update_icon() which is standard on all objects/items. Does the same refactor for power cells and adjusts the proc call in relevant files (hence the amount of 1-line changes in various files)
- Makes floodlights properly use CELLRATE. Their load is 200 watts. Cell adjusted accordingly, it starts with 1k cell, which is enough for ~40 minutes (roughly)
- Floodlights with almost discharged cell (less than 10%) ocassionally "flicker", dimming for few seconds. This serves as indicator that the power cell is running low.
- Floodlight luminosity adjusted. They now shine slightly more, espicially closer to the floodlight.
2015-05-28 21:45:54 +02:00
Atlantis
7981777c41 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-28 20:16:12 +02:00
GinjaNinja32
42623947e1 Merge pull request #9539 from atlantiscze/get-apc-refactor
Refactors get_apc()
2015-05-28 19:11:36 +01:00
Atlantis
a4c29238aa Refactors get_apc()
- Fixes #9536
- Area now has APC variable, instead of list. APC construction, etc. should have checks to allow one APC per area only, so situations with multi-APC areas are unlikely, unless adminbus occurs. Either way, with or without this commit, one of the APCs would be unoperational (no load)
- get_apc() no longer uses very laggy locate() in contents of area. In situations where get_apc() is called repeately this brings massive increase in performance (from 0.120 to 0.000, depending on area size and amount of things in contents of that area) as it now only returns the apc variable.
2015-05-28 17:11:26 +02:00
Kelenius
f2c0cb483d Fixes skrell and dionaea alcohol resistance/weakness 2015-05-28 08:49:58 +03:00
Raptor1628
62ef32a725 Rig Icon Fixes
Fixes some incorrect names that were resulting in broken icons.
2015-05-27 23:32:27 -04:00
Zuhayr
5ea78421ff Merge pull request #9408 from mwerezak/sm-eject
Limits the ability of the SM to return to the station zlevel once ejected
2015-05-28 11:35:39 +09:30
Zuhayr
28265a3e2e Merge pull request #9457 from atlantiscze/satellite-solars
Telecommunications Solar Arrays
2015-05-28 11:34:09 +09:30
Zuhayr
adbacc0cc1 Merge pull request #9494 from mwerezak/rigfix
Fixes #9493
2015-05-28 11:09:08 +09:30
PsiOmegaDelta
414a4321fd Merge pull request #9496 from mwerezak/ivstand
IV stands are no longer bullet shields
2015-05-27 19:57:40 +02:00
GinjaNinja32
b9cd4ba023 Adds logging and admin investigatability (read: checking what the virus does) to virus events 2015-05-27 10:36:45 +01:00
mwerezak
b4adb1a432 Updates species checks 2015-05-27 01:34:50 -04:00
mwerezak
7dcc98e1a4 Fixes robotic organs causing pain messages
Also fixes pain() not checking if the species has NO_PAIN.
2015-05-27 01:15:55 -04:00
mwerezak
68e205e7b3 Fixes robot limbs spamming sparks and messages endlessly
Fixes robot limbs spamming malfunctioning messages and spark effects
endlessly if one arm is malfunctioning while holding an item in the
other arm.
2015-05-27 01:15:14 -04:00
mwerezak
7d4c3235dc Fixes #9460 2015-05-27 01:13:53 -04:00
Chinsky
8eb75ae398 Merge pull request #9480 from Kelenius/ofResearchAndRuntime
Fixes #9473
2015-05-27 06:36:50 +03:00