mwerezak
13c760c5bb
Fixes #9453 and fixes #10614
2015-08-22 11:09:17 -04:00
Zuhayr
8564db4643
I am a fucking moron.
2015-08-22 04:10:44 +09:30
Zuhayr
eb0f48d412
Xenos use bodytype for species_restricted, Vox can wear softsuits.
...
Conflicts:
code/modules/clothing/clothing.dm
2015-08-22 02:54:14 +09:30
Zuhayr
bb82f80885
Added get_bodytype() species proc as groundwork for subspecies.
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
Zuhayr
8701205783
Pariah nerfs.
...
Conflicts:
code/modules/mob/living/carbon/human/species/outsider/vox.dm
code/modules/organs/organ_alien.dm
2015-08-22 02:51:42 +09:30
Kelenius
cf78446463
Fixes #10730
2015-08-18 16:10:25 +03:00
Kelenius
afc5414ed9
Removes a few outdated mob mentions. Fixes a few things. Almost definitely fixes #7570 .
2015-08-18 10:48:22 +03:00
Zuhayr
b6e7d33f3d
Merge pull request #10715 from GinjaNinja32/irc
...
Adds settable rank to IRC messages, changes it so non-admins can see …
2015-08-17 18:51:53 -07:00
GinjaNinja32
f0c8db3d0f
Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs
2015-08-18 02:16:50 +01:00
GinjaNinja32
e596d3bdd6
Merge pull request #10681 from mwerezak/lighting
...
Ports fix for #10660
2015-08-17 14:17:53 +01:00
Zuhayr
b27811ee07
Merge pull request #10700 from GinjaNinja32/locket
...
Remove Sabess's custom item from code, it's been replaced with an entry in the new system.
2015-08-17 03:04:42 -07:00
GinjaNinja32
4cc31d10d9
Remove Sabess's custom item from code, it's been replaced with an entry in the new system.
2015-08-17 10:31:29 +01:00
Zuhayr
82a368c0c4
Merge pull request #10690 from NullSnapshot/hotfix
...
Bandaid fix for process scheduler bloating status tab
2015-08-16 23:54:34 -07:00
NullSnapshot
e99f98e13f
No need for the statpanels.
2015-08-16 23:24:25 -07:00
PsiOmegaDelta
9d0c072b4a
Adjusts Bump flags to make ALLMOBS mean all mobs again.
2015-08-17 08:06:42 +02:00
NullSnapshot
438837a9be
Moves ProcessScheduler list to new Processes tab.
2015-08-16 22:46:18 -07:00
PsiOmega
4d826e68cb
Mob bump fixes.
...
ED-209 is considered massive enough to not bump easily.
update_canmove() no longer unconditionally sets mob density. Fixes #10365 . Fixes #10682 .
2015-08-16 20:55:02 +02:00
mwerezak
b21bd0c42d
Ports fix for #10660 from vg
...
Courtesy of PJB3005
2015-08-16 14:24:44 -04:00
GinjaNinja32
f0c9f16099
Merge pull request #10677 from PsiOmegaDelta/150816-SynthSay
...
Synth say fixes.
2015-08-16 14:55:04 +01:00
GinjaNinja32
0fe3c6e926
Merge pull request #10678 from PsiOmegaDelta/150816-PrivateSay
...
Makes the private AI channel truly private.
2015-08-16 14:53:38 +01:00
PsiOmega
21fd8d825d
Makes the private AI channel truly private.
2015-08-16 15:43:28 +02:00
PsiOmega
0b01482eb6
Synth say fixes.
...
Adds synth message sanitizing. Fixes #10667 .
Makes sure say() code at least to some degree returns expected values. Fixes #10675 .
2015-08-16 14:00:29 +02:00
Zuhayr
0c2d0852ae
Merge pull request #10666 from PsiOmegaDelta/150815-RoundDuration
...
Round Duration display
2015-08-16 03:40:23 -07:00
PsiOmegaDelta
311dbcb0f0
Merge pull request #10658 from mwerezak/chem-fix
...
Fixes overdose not working for ingested reagents
2015-08-16 10:18:16 +02:00
PsiOmega
1186ec2af6
The stat panel now displays station time along with current round duration.
2015-08-15 22:09:18 +02:00
mwerezak
5f98346ab5
Fixes overdose not working for ingested reagents
2015-08-15 10:22:07 -04:00
Kelenius
cb5df3963a
Reverts #10649 , fixes #10621
2015-08-15 13:15:52 +03:00
Kelenius
3b29856694
Fixes #10599
2015-08-15 13:04:57 +03:00
Snapshot
3b7ed9bdc4
Merge pull request #10649 from mwerezak/coffee-fix
...
Fixes #10621
2015-08-14 22:51:43 -07:00
Snapshot
5f5671d21f
Merge pull request #10647 from mwerezak/acids
...
Fixes #10645
2015-08-14 22:22:41 -07:00
mwerezak
3163de7a50
Fixes #10621
...
Coffee now adds jittery as an overdose effect. Set overdose so that drinking two full cups in one go (60 units) will result in 150 jitteriness.
2015-08-14 23:44:46 -04:00
Chinsky
4ba0a65420
Merge pull request #10648 from mwerezak/circuit-printer
...
Fixes #10637
2015-08-15 06:37:31 +03:00
mwerezak
a5fd2d386c
Fixes #10637
2015-08-14 23:34:24 -04:00
mwerezak
133bc96344
Fixes #10645
...
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
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
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
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
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
