Commit Graph

5725 Commits

Author SHA1 Message Date
Chinsky
8a21670d0b Merge pull request #10639 from GinjaNinja32/language
Fix not being able to select Siik'tajr or Sinta'unathi as default via Check-Known-Languages
2015-08-15 06:11:58 +03:00
Chinsky
6ab8a11da8 Merge pull request #10646 from mwerezak/aghost
Aghosted mobs no longer act as SSD
2015-08-15 06:10:49 +03:00
mwerezak
cd153ad975 Aghosted mobs no longer act as SSD
Removed player_logged var since it didn't serve it's intended purpose and replaced with aghosted var. Changed SSD checks to only look at client since regardless of what key gets set to I think we probably don't want players being told a mob is SSD if there is some client controlling it.
2015-08-14 22:41:51 -04:00
GinjaNinja32
88433b6b98 Merge pull request #10641 from atlantiscze/kill-all-humans
Newmalf Fixes
2015-08-15 03:36:35 +01:00
Atlantis
7e8bfde893 Increases CPU income from APC hacking
- CPU generation from APCs is now doubled
2015-08-14 23:03:48 +02:00
Atlantis
20961ae9b6 Corrects wrongly displayed CPU generation.
- Value displayed was per decisecond, not per second. Corrected.
2015-08-14 23:00:53 +02:00
GinjaNinja32
2847c08b77 Fix not being able to select Siik'tajr or Sinta'unathi as default via Check-Known-Languages 2015-08-14 21:30:09 +01:00
mwerezak
c4ed6a10aa Merge pull request #10609 from PsiOmegaDelta/150813-ReagentQdel
qdel(reagent) adjustments.
2015-08-13 12:35:08 -04:00
PsiOmegaDelta
d1e8f670b2 qdel(reagent) adjustments.
Attempts to ensure qdel(reagents) only occur once per Destroy()
2015-08-13 10:26:31 +02:00
PsiOmegaDelta
e1db48e50f Typo fix.
Minor typo fix: Unladed to unloaded.
2015-08-13 09:26:41 +02:00
GinjaNinja32
98c2a0c8b1 Merge pull request #10594 from mwerezak/embed-fix
Embedding and broken limb fixes
2015-08-13 04:52:20 +01:00
mwerezak
1dc853710c Implant items do not count for continuing to process embedded objects
Also makes embedded pain messages respect NO_PAIN.
2015-08-12 23:38:44 -04:00
mwerezak
99e1d88285 Fixes #10592
Fixes the right hand being affected if the left arm was broken.
2015-08-12 22:41:30 -04:00
mwerezak
62ad3a7be4 Fixes #10593
Adds a embedded_needs_process() proc to determine if the mob has embedded objects that still need to be processed. The get_visible_implants() remains to determine which implants can be seen on examine and yanked out.
2015-08-12 22:24:14 -04:00
GinjaNinja32
792d6e2864 Merge pull request #10579 from mwerezak/misc
Fixes
2015-08-12 22:21:34 +01:00
HarpyEagle
74f9e6ce63 Fixes #10552 2015-08-12 16:45:45 -04:00
HarpyEagle
7a86d6e658 Fixes #10571
Adds another snowflake electronic item to the can_hold list.
2015-08-12 16:06:31 -04:00
mwerezak
5b6c5ee5ce Merge pull request #10570 from Zuhayr/master
Couple of fixes.
2015-08-12 15:00:36 -04:00
Zuhayr
9831aede3f Fixes drone pulling. 2015-08-13 03:31:57 +09:30
PsiOmegaDelta
94e3fe6f5f Merge pull request #10567 from mwerezak/fire-cooling-fix
Fixes carbon fire_act()
2015-08-12 19:54:42 +02:00
Chinsky
8c8c2bce85 Merge pull request #10503 from PsiOmegaDelta/150811-BorgSpawnRuntime
Fixes a borg spawn runtime.
2015-08-12 20:42:04 +03:00
HarpyEagle
1e8e0547e4 Fixes carbon fire_act()
Caused fire to actually cool down the mob if the mob was already hotter
than the exposed temperature.
2015-08-12 11:58:11 -04:00
Zuhayr
4db1a553f2 Merge pull request #10556 from PsiOmegaDelta/150812-Stripping
Adds sanity checks for stripping.
2015-08-13 00:39:41 +09:30
PsiOmegaDelta
67c79e7a1b Adds sanity checks for stripping.
Mobs can no longer strip other mobs while prone, unconscious, or buckled down. Fixes #10553.
2015-08-12 13:12:52 +02:00
PsiOmegaDelta
48d5e73729 Fixes an observer runtime. 2015-08-12 09:10:16 +02:00
PsiOmegaDelta
7031ff0b43 Fixes human spawn runtime.
Similar to #10503.
2015-08-12 09:07:48 +02:00
PsiOmega
da6a3e98d8 Fixes a borg spawn runtime.
Adds client check to prevent null.statpanel runtime.
2015-08-12 08:04:11 +02:00
PsiOmegaDelta
163ac0de1e Merge pull request #10521 from GinjaNinja32/mirror_gender
Mirrors no longer check the user's gender when finding the list of valid hairstyles
2015-08-12 06:26:45 +02:00
GinjaNinja32
41965d93ef Mirrors no longer check the user's gender when finding the list of valid hairstyles 2015-08-12 01:00:43 +01:00
PsiOmega
e4f6436a85 Fixes #10494.
Borgs have their very own custom little headset, so cute.
2015-08-11 21:11:16 +02:00
Chinsky
7b1656f40c Merge pull request #10470 from Karolis2011/dev-freeze
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
2015-08-11 20:07:06 +03:00
Zuhayr
20e7ee0b71 Merge pull request #10111 from mwerezak/eye-attack
Makes grab eye attacking respect species lore better
2015-08-12 02:36:50 +09:30
PsiOmega
78ffb5835a Misc. 2015-08-11 17:33:03 +02:00
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta
54162f1c7d Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes 2015-08-11 12:20:54 +02:00
mwerezak
c98b6a1d97 Merge pull request #10457 from Zuhayr/dev-freeze
Custom item rolldown.
2015-08-09 10:33:54 -04:00
PsiOmega
889f399356 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/area/areas.dm
	code/game/machinery/alarm.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-08-09 13:15:22 +02:00
PsiOmegaDelta
31b8335298 Merge pull request #10456 from mwerezak/air-alarm
Fixes
2015-08-09 10:09:02 +02:00
Zuhayr
aed2ac3dfe Moved custom_synthetic.dmi into a proper define. 2015-08-09 16:48:20 +09:30
mwerezak
b1b3b4899b Fixes #7928
Uses camera/set_status() to ensure viewers are kicked and camera cache updated.
2015-08-09 00:24:18 -04:00
PsiOmegaDelta
22c500ed2b Merge pull request #10452 from mwerezak/stump-fix
Backports #10331
2015-08-08 19:16:25 +02:00
mwerezak
1e3d3101de Fixes #9966 2015-08-08 11:28:22 -04:00
Kearel
4139a51946 Initial fixes
Changes interaction between stumps and items.

Conflicts:
	code/modules/organs/organ_stump.dm
2015-08-08 11:10:28 -04:00
PsiOmegaDelta
c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix
Material stack related fixes
2015-08-08 09:56:25 +02:00
PsiOmegaDelta
87fcd408bd Merge pull request #10436 from mwerezak/cult-construct-nightvision
Adds nightvision to cult constructs
2015-08-06 06:38:49 +02:00
mwerezak
e5950d32d8 Merge pull request #10264 from RavingManiac/dev-freeze
Refactors floating and magboot checks. Fixes #10256
2015-08-05 23:05:34 -04:00
PsiOmegaDelta
6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
2015-08-05 09:16:50 +02:00
GinjaNinja32
c71d78ab1a add debug verb as pAI-spawning adminverb 2015-08-05 00:50:04 +01:00
GinjaNinja32
117ffca6d0 Merge pull request #10423 from Kelenius/ofBotsAndZAS
Of bots and ZAS
2015-08-04 13:26:30 +01:00
GinjaNinja32
9a4b53c765 Merge pull request #10360 from atlantiscze/beep-beep-beepsky
Fixes #10355
2015-08-04 12:36:35 +01:00