cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,087 Commits 10 Branches 0 Tags
ef8e3a94a0a9b6fd64cbb1e8b7f29e31507c0cea
Commit Graph

11878 Commits

Author SHA1 Message Date
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
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
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
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