Commit Graph

18883 Commits

Author SHA1 Message Date
mwerezak
cbeaabee9c Replaces setting ORGAN_ROBOT flag with robotize() call 2015-05-30 14:25:53 -04:00
mwerezak
40d437f988 Assigns w_class to external organ types 2015-05-30 14:24:46 -04:00
mwerezak
92de9fb432 Replaces health assignments with max_damage 2015-05-30 14:20:50 -04:00
mwerezak
6dbd565079 Merge remote-tracking branch 'upstream/dev' into robolimbs2 2015-05-30 08:32:31 -04:00
Zuhayr
b6ddafb476 Merge pull request #9502 from Kelenius/ofAIAndLooc
AI now hears LOOC both around its eye and its core, and speaks in LOO…
2015-05-30 02:10:25 +09:30
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
34ceac7cc6 Fixes IPCs getting fleshy stumps, makes robot limbs become unusable above max_damage 2015-05-28 22:10:28 -04: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
ccf9afb9cb Implements PsiOmegaDelta's suggestion (fixed edition) 2015-05-28 17:24:41 +02: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
PsiOmegaDelta
928722c08a Merge pull request #9526 from Raptor1628/dev-freeze
Rig Icon Fixes
2015-05-28 07:06:02 +02:00
Raptor1628
62ef32a725 Rig Icon Fixes
Fixes some incorrect names that were resulting in broken icons.
2015-05-27 23:32:27 -04:00
Yoshax
850301ed0f Fixes bluespace relay issues (being un deconstructable, and not building properly. 2015-05-28 03:56:53 +01: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
Kelenius
9a24b5b1cb AI now has a prefix, (Core) or (Eye), depending on where it hears LOOC 2015-05-27 21:13:34 +03:00
PsiOmegaDelta
414a4321fd Merge pull request #9496 from mwerezak/ivstand
IV stands are no longer bullet shields
2015-05-27 19:57:40 +02:00
PsiOmegaDelta
9ccb2d4f61 Merge pull request #9499 from mwerezak/robolimbs
Robolimb fixes
2015-05-27 19:57:08 +02:00
Zuhayr
00ede5d475 Merge pull request #9477 from comma/dev-freeze
Moved Captain's announcment out of equipping to spawning.
2015-05-28 03:09:25 +09:30
PsiOmega
e0177765c6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-05-27 17:52:55 +02:00
Kelenius
19aa1c0ae8 AI now hears LOOC both around its eye and its core, and speaks in LOOC around its eye 2015-05-27 13:14:22 +03:00
mwerezak
6e63985a51 Adjusts IPC head health 2015-05-27 02:31:00 -04:00
mwerezak
af8a173e30 Changes IPC eyes to optics, generalizes vision organs
Now any organ can cause vision loss if damaged, not just ones that
inherit from organ/internal/eye.
2015-05-27 02:18:11 -04:00
mwerezak
b4adb1a432 Updates species checks 2015-05-27 01:34:50 -04:00
mwerezak
7423f2ecfd IPC mmi_holder is now carried in the chest
Adds an optical sensor organ (eyes) for IPCs so that losing their head
still does something to them.
2015-05-27 01:24:34 -04:00
mwerezak
2098c80849 Damage on robot limbs no longer counts towards shock and crit
Damage on robot limbs no longer counts towards traumatic_shock and crit.
Raises the damage mod in exchange.
2015-05-27 01:24:00 -04:00
mwerezak
8b300df936 Generalizes limb damage mods 2015-05-27 01:23:22 -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
Zuhayr
c62514887b Merge pull request #9481 from PsiOmegaDelta/150526-Inactivity
Inactivity process tweaks.
2015-05-27 13:24:22 +09:30
Chinsky
286e8c711a Merge pull request #9484 from Dennok/#9196
Fix #9196
2015-05-27 06:37:40 +03:00
Chinsky
8eb75ae398 Merge pull request #9480 from Kelenius/ofResearchAndRuntime
Fixes #9473
2015-05-27 06:36:50 +03:00
Chinsky
3d5b7e5744 Merge pull request #9464 from Kelenius/ofChemAndAnalyze
Medical scanners now scan ingested reagents
2015-05-27 06:32:20 +03:00
mwerezak
31b2ce9cf7 IV stand span classes 2015-05-26 23:07:21 -04:00
mwerezak
e510f6625f Fixes IV stands blocking bullets
IV stands now check PASSTABLE, allowing projectiles and small mobs to
pass through them.

Flipped tables now block small mobs.
2015-05-26 23:05:38 -04:00
Dennok
7edbd83ba6 Fix Emergency Floodlight
up
2015-05-26 14:31:44 +03:00
Chinsky
bae5bf8b4a Monkeys are scoopable again. 2015-05-26 13:44:01 +03:00
PsiOmegaDelta
2b749602c7 Merge pull request #9475 from Zuhayr/paiscoop
Allows pAIs to be scooped up and worn as hats.
2015-05-26 12:39:05 +02:00
PsiOmega
98c585615e Inactivity process tweaks.
Partially by request:
The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
2015-05-26 09:04:26 +02:00
Kelenius
f7814e2394 Fixes #9473
Also: removes automatic shuttle calls when callers are destroyed;
Applies qdel;
Fixes teleporter control console design that probably didn't work
before.
2015-05-26 09:58:25 +03:00
PsiOmega
62185bc0a8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-26 08:35:32 +02:00
PsiOmega
5a1bf5a6a4 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/toys.dm
2015-05-26 08:26:48 +02:00
Ccomp5950
fff9e5ec92 Merge pull request #9463 from PsiOmegaDelta/SinfulLiving
Fixes #9461.
2015-05-26 02:11:31 -04:00
Chinsky
f1c194d5e9 Moved Captain's announcment out of equipping to spawning. Removed redundant satchel spawning things - they are being taken care of in job's equip() 2015-05-26 09:11:04 +03:00
Zuhayr
0104de03d4 Allows pAIs to be scooped up and worn as hats.
Readds missing monkey inhands
Standardized get_scooped() calls to mousedrop instead of attack_hand.
Changelog.
2015-05-26 15:15:15 +09:30
Zuhayr
1b4b428fe9 Removed several unneeded icons from inhands, split holder icons into their own file. 2015-05-26 14:05:21 +09:30