Commit Graph

19634 Commits

Author SHA1 Message Date
GinjaNinja32
74f47de0e5 'fixes' spacestation13.com's server banner
they appear to just use the 8th field of the reply for the player count, rather than parsing the reply; this moves player count back to being the 8th entry
2015-08-15 03:18:40 +01:00
mwerezak
4fab38a7c6 Merge pull request #10622 from comma/virofixes
Virofixes
2015-08-13 23:16:59 -04:00
Chinsky
0056a889de Moved antibodies to the rest of reagents.
Updates them to use new chem processing.
Also axes unused commented out code.
2015-08-14 04:53:46 +03:00
Chinsky
38adf2c5b4 Fixes #10294
Now if virus can infect lesser/greater form of specie, it can infect its counterpart.
Also made viruses affect only joinable species to lessen a chance of spawning a virus that they can't work on (e.g. slime-affecting viruses that can't be injected into monkeys). As a side-effect viro reports are a little less inane listing all the species crewmembers aren't supposed to know about like xenomorphs and Shadows.
2015-08-14 04:20:44 +03:00
mwerezak
1f7497063a Merge pull request #10618 from GinjaNinja32/10617
fix #10617
2015-08-13 16:20:32 -04:00
GinjaNinja32
1d3a2c1a31 fix #10617 2015-08-13 21:01:46 +01:00
mwerezak
c4ed6a10aa Merge pull request #10609 from PsiOmegaDelta/150813-ReagentQdel
qdel(reagent) adjustments.
2015-08-13 12:35:08 -04:00
PsiOmegaDelta
f95efdc0a1 Merge pull request #10612 from Raptor1628/master
Fixes Grenade Launcher module sprite again
2015-08-13 17:08:36 +02:00
Zuhayr
84678a91c1 Fixes roundend failing to scroll, fixes teams not getting shared global objectives. 2015-08-14 00:18:41 +09:30
Raptor1628
0274f87172 Fixes Grenade Launcher module sprite again
It didn't stick last time, so let's go again!
2015-08-13 10:11:11 -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
Zuhayr
e362e13433 Merge pull request #10605 from PsiOmegaDelta/150813-TypoFix
Typo fix.
2015-08-13 17:01:25 +09:30
PsiOmegaDelta
e1db48e50f Typo fix.
Minor typo fix: Unladed to unloaded.
2015-08-13 09:26:41 +02:00
PsiOmegaDelta
ccf6fa285d Removes Flesh to Stone fully.
Fixes #10600.
2015-08-13 08:25:03 +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
Chinsky
6d4699fa32 Merge pull request #10590 from GinjaNinja32/debug
more debug stuff
2015-08-13 05:22:45 +03:00
GinjaNinja32
8d57f25fd5 Add a runtime-generating call to the "object was deleted via del() rather than qdel()" log, so we can get a stack trace from it 2015-08-13 01:51:40 +01:00
GinjaNinja32
83b26cf43a Revert "Debug code to try to figure out the cause of the player-panel etc breaking"
This reverts commit 9dacc146cd.
2015-08-13 01:45:41 +01:00
Atlantis
f41387a57f Communications emergency-fix
- Comments out buggy code that caused some telecommunication machines to introduce insane delay (up to 30s)
2015-08-13 00:07:32 +02: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
HarpyEagle
19fbc71249 Removes req_amount from stack_recipe_list
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
2015-08-12 15:54:16 -04:00
HarpyEagle
3e6889927e Fixes #10500 2015-08-12 15:26:57 -04:00
HarpyEagle
a43f77b070 Gives hydro soil recipe a better name
Gives the hydro soil recipe a name that better conveys it's purpose.
2015-08-12 15:25:01 -04:00
mwerezak
5b6c5ee5ce Merge pull request #10570 from Zuhayr/master
Couple of fixes.
2015-08-12 15:00:36 -04:00
Zuhayr
5f17cf4397 Merge pull request #10568 from SparklySheep/patch-14
Fixes #10532
2015-08-13 04:18:23 +09:30
Zuhayr
64a89fc5e4 Removes seed colour from nymphs. 2015-08-13 03:33:28 +09:30
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
Chinsky
0e52b3d4df Merge pull request #10562 from PsiOmegaDelta/150812-OneCrew
Fixes the One Crew Member module.
2015-08-12 20:38:52 +03:00
Chinsky
069de7dcb6 Merge pull request #10560 from PsiOmegaDelta/150812-CorrectTypeCheck
Prevents APC wires from being displayed to the AI.
2015-08-12 20:38:34 +03:00
Chinsky
e562affd13 Merge pull request #10551 from PsiOmegaDelta/150812-RuntimeFixes
Runtime fixes.
2015-08-12 20:38:20 +03:00
SparklySheep
27296e7caf Update preferences_gear.dm 2015-08-12 12:13:28 -05:00
SparklySheep
cefd32fa69 Update glasses.dm 2015-08-12 12:09:00 -05:00
HarpyEagle
a62edc5b3a Fixes #10548 2015-08-12 12:21:28 -04:00
HarpyEagle
9609ce0b0d Fixes #10546 2015-08-12 12:06:31 -04: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
mwerezak
565ccc2baa Merge pull request #10545 from PsiOmegaDelta/150812-QdelFix
Qdels the photo dummy.
2015-08-12 10:29:41 -04:00
mwerezak
db71f6a03d Merge pull request #10541 from PsiOmegaDelta/150812-BotCheck
Re-adds missing bot check.
2015-08-12 10:28:45 -04:00
mwerezak
8da78d09e9 Merge pull request #10542 from PsiOmegaDelta/150812-HoloStools
Holodeck stool icon fix.
2015-08-12 10:28:12 -04:00
PsiOmegaDelta
249db0b03d Fixes the One Crew Member module.
Didn't return properly in install().
Override transmitInstructions() when addAdditionalLaws() was more than sufficient.
2015-08-12 14:42:52 +02:00
PsiOmegaDelta
1b7b69306c Prevents APC wires from being displayed to the AI.
Restores and makes the mob type check more specific. Fixes #10559.
2015-08-12 13:34:12 +02:00
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
3e4ec4d7b7 NanoUI windows now close on Destroy(), preventing all sorts of qdel issues. 2015-08-12 09:41:22 +02:00