cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 05:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,264 Commits 9 Branches 26 Tags
fb670400a13adce2c113a8d191bdd93572cb303e
Commit Graph

4587 Commits

Author SHA1 Message Date
Chinsky
667debfb3c Merge pull request #10745 from mwerezak/mob-grab 
Cleans up mob_grab.dm
 2015-09-01 12:58:50 +03:00
Zuhayr
ac04bdfb52 Readded monkey scooping. 
Conflicts:
	code/modules/mob/living/carbon/human/species/species.dm
 2015-08-31 07:01:56 +09:30
mwerezak
3e967872a3 Allows grabs to be resisted while weakened 2015-08-28 14:08:59 -04:00
Daranz
d5b618adac Fix Say ":i" working with intercoms, re-add restraint check for Say ":i" 
See also commits:
e9d9ff57ba
bbc8ad6383
b9dbeeb356
 2015-08-28 17:33:52 +02:00
Zuhayr
701282d2b0 Merge pull request #10889 from PsiOmegaDelta/150826-AdjacentStripping 
Must now be adjacent to mobs you are stripping.
 2015-08-27 06:51:54 +09:30
PsiOmegaDelta
9c5aba72f0 Must now be adjacent to mobs you are stripping. 
Fixes #10884.
 2015-08-26 08:12:02 +02:00
Kearel
ea402d6714 #10833 + 2015-08-24 19:20:56 -05:00
Kearel
d1504b49b9 Fixes #10833 2015-08-24 18:12:38 -05:00
PsiOmega
f28fa29d54 Having organs should no longer prevent vent crawling. 2015-08-24 17:27:22 +02:00
Zuhayr
ddcf7ec282 Merge pull request #10837 from mwerezak/brainloss-fix 
Fixes adjustBrainLoss
 2015-08-24 15:24:12 +09:30
mwerezak
5bcede5801 Fixes adjustBrainLoss 
adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change.
 2015-08-23 20:22:15 -04:00
Chinsky
13257b52c4 Merge pull request #10824 from mwerezak/stump-desc-fix 
Fixes limb stump examine text
 2015-08-24 00:31:05 +03:00
mwerezak
3c86715474 Fixes limb stump examine text 2015-08-23 15:35:45 -04:00
volas
d31203c70f Sanitize for AI emergency message 2015-08-23 15:24:52 +03:00
mwerezak
13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
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
PsiOmegaDelta
9d0c072b4a Adjusts Bump flags to make ALLMOBS mean all mobs again. 2015-08-17 08:06:42 +02: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
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
PsiOmega
1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02: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
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
7031ff0b43 Fixes human spawn runtime. 
Similar to #10503.
 2015-08-12 09:07:48 +02:00