cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 11:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,031 Commits 6 Branches 0 Tags
9a62ba8cda1ed3a0d9108adc9920c283f45c6962
Commit Graph

25480 Commits

Author SHA1 Message Date
ShadowLarkens
9a62ba8cda Chem Master/Chem Dispenser 30/60u, + multibottle 2020-08-10 04:10:36 -07:00
Cyantime
1ccbf75ac9 Fix mob_spawner death checking 2020-08-09 22:11:20 -04:00
ShadowLarkens
b1425af20f Make vore panel more consistent and add tooltips 2020-08-09 00:19:35 -07:00
ShadowLarkens
f13fda0afb TGUI Vore Panel 2020-08-09 00:19:35 -07:00
ShadowLarkens
cdd98e4ebd Resleeving fixes 2020-08-08 22:52:50 -07:00
Novacat
197fc5dfc5 Merge pull request #8642 from VOREStation/upstream-merge-7433 
[MIRROR] Gives mice non-default melee stats
 2020-08-09 00:30:13 -04:00
Novacat
a621b9ee7d Merge pull request #8639 from VOREStation/upstream-merge-7425 
[MIRROR] Tweak to kitchen machinery:
 2020-08-09 00:27:42 -04:00
Atermonera
5bd8a0955a Merge pull request #7433 from Verkister/patch-45 
Gives mice non-default melee stats
 2020-08-08 23:57:43 -04:00
Novacat
2b45a2613c Update Chemistry-Machinery.dm 2020-08-08 23:56:46 -04:00
Atermonera
afb5819c32 Tweak to kitchen machinery: 2020-08-08 23:53:58 -04:00
Atermonera
91587c6904 Merge pull request #7398 from Cerebulon/stickyfixy 
Stickynote tweaks
 2020-08-08 23:50:23 -04:00
Novacat
be7206526a Merge pull request #8595 from lbnesquik/Kot-Janihound-tweak 
Add a belly size upgrade for hounds and fix an important typo.
 2020-08-08 16:30:46 -04:00
Verkister
554bc2de1b oop 2020-08-08 21:23:40 +03:00
Verkister
f2d561f28f Adds raptor pAI 
-Adds raptor pAI chassis option.
-Also fixes the misnamed full belly sprites for raccoon chassis.
 2020-08-08 21:15:43 +03:00
Novacat
7c4ae0cc60 Merge pull request #8613 from Novacat/nova-pathfinder 
Removes Reagent Implants
 2020-08-07 12:24:17 -04:00
Novacat
88a3aa051b Merge pull request #8625 from VOREStation/upstream-merge-7416 
[MIRROR] Adds Modifier Armor
 2020-08-07 12:23:22 -04:00
Novacat
3c681357d2 Merge pull request #8627 from ShadowLarkens/tgui_backend_changes 
TGUI Backend Tweaks & Fixes
 2020-08-07 12:23:06 -04:00
ShadowLarkens
f8881b2ca7 Fix Medical Records Virology 2020-08-07 04:55:04 -07:00
ShadowLarkens
dc6c47841d TGUI Backend Tweaks & Fixes 2020-08-07 00:29:50 -07:00
Novacat
6866cf2cbf Merge pull request #8601 from Rykka-Stormheart/shep-dev-mulebot-steppies-fix 
Fix Mulebot Crossed() Code, allows simplemobs to be crushed if laying
 2020-08-07 00:29:58 -04:00
Neerti
bc1db6310e Adds Modifier Armor (#7416) 2020-08-07 00:25:15 -04:00
Neerti
ee88ceb427 Fixes Arachnophobia Exploit 2020-08-07 00:08:56 -04:00
Novacat
dd7754514c Merge pull request #8587 from Cyantime/slimetext 
Fix promethean core revival flavor text and OOC notes
 2020-08-06 20:21:38 -04:00
Unknown
9e99e2893a compatibility fix 2020-08-06 15:20:33 -04:00
Atermonera
1b064616ab Merge pull request #7408 from Greenjoe12345/teshmessage 
adds cold discomfort messages for tesh + one new for heat
 2020-08-06 15:11:46 -04:00
Novacat
043131e04a Merge pull request #8612 from VOREStation/upstream-merge-7409 
[MIRROR] Adjusts Skrellian hair names to fit descriptions on wiki
 2020-08-06 15:04:01 -04:00
Novacat
96b8590a2e Merge pull request #8609 from VOREStation/upstream-merge-7391 
[MIRROR] Adds tg-style fast(ish) magazine restocking.
 2020-08-06 15:02:25 -04:00
Unknown
3aae040622 Removes Reagent Implants 
As per a decision by staff, all whitelists for Reagent Implants (both milk and egg) have been rescinded, these are to be replaced by a generic 'Feeder' neutral trait that is now available as per this PR.

If you have any questions, concerns, or comments about this PR, it would be far better (for both yourself and my sanity) to direct those to the Head Staff.
 2020-08-06 14:52:49 -04:00
Atermonera
3dd79b6729 Merge pull request #7409 from listerla/headtailnames 
Adjusts Skrellian hair names to fit descriptions on wiki
 2020-08-06 14:46:21 -04:00
ForFoxSake
ed1d9a8a04 Adds tg-style fast(ish) magazine restocking. (#7391) 
* Allows magazines to be reloaded automatically from piles of bullets.

* Fixes usr, adds changelog.
 2020-08-06 14:24:03 -04:00
Atermonera
2830f4e35c Merge pull request #7390 from Cerebulon/schneemobs 
Adds some surface mobs.
 2020-08-06 14:22:46 -04:00
Novacat
369e3448ed Merge pull request #8602 from VOREStation/upstream-merge-7361 
[MIRROR] Overdose changes + General chem mods
 2020-08-06 02:59:32 -04:00
Novacat
acbd596f0b Update Chemistry-Reagents-Core.dm 2020-08-06 02:41:05 -04:00
Rykka
19a90b6bd3 Aurora Cooking Pre-heating bugfix 
Appliances previously had 60k resist and 30k resist, for fryer and oven respectively.

This meant that fryer would heat up in 62 minutes and oven would heat in 35-45. Obviously completely out of wack.

Now grill heats in at 6:50, fryer at 10:35, and oven at 12:10 to reach peak/cap temperatures!
 2020-08-06 00:19:12 -04:00
Rykka
86bf733872 Fix Mulebots running over themselves, fix runtime with blood.dm 2020-08-05 22:18:13 -04:00
Rykka
992d204432 Remove safety bit, unneeded, remove lying check, also unneeded. 
Relocate macro/micro bump to _vr
 2020-08-05 21:00:40 -04:00
Atermonera
012a4a290c Overdose changes + General chem mods 2020-08-05 20:53:32 -04:00
Rykka
d07746d84e Fix Mulebot Crossed() Code, allows simplemobs to be crushed if laying 
Fixes Mulebots (and really any vehicles) ruthlessly murdering macros/micros without care, will actually run over mobs properly now. 

Pathing fixes will be in a second PR.
 2020-08-05 20:23:43 -04:00
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
Rykka
da150db4a4 Fix assignment in conditional warning/error 2020-08-05 13:57:08 -04:00
lbnesquik
c01019c25e Add a belly size upgrade for hounds: 
- Researchable upgrade. It fits only hounds. It doubles the capacity of their sleeper for items. Usable only once. This does not affect number of patients.
 2020-08-05 14:53:24 +02:00
lbnesquik
8d90c8bd7c Fixes a typo in resize_vr. 2020-08-05 14:44:08 +02:00
Cyantime
78ec7a7733 Fix promethean revival flavor text and OOC notes 2020-08-05 05:26:03 -04:00
Novacat
b3b7e4d778 Merge pull request #8577 from lbnesquik/Kot-saddle-tweak 
Tweaks to taur clothes, particularly saddles as well as taur tail tags
 2020-08-04 18:40:31 -04:00
Novacat
8ea243def0 Merge pull request #8583 from Novacat/nova-pathfinder 
Nerfs harm/disarm steppies
 2020-08-04 16:37:05 -04:00
Rykka
5344b97069 Skip calling handle_ambience() if there is no client assigned 
Fixes potential CPU usage issue for EVERY single mob having that call
 2020-08-04 16:11:17 -04:00
ShadowLarkens
d0c9b7ccd1 Fixed TGUI Not refocusing mapwindow 2020-08-03 20:50:02 -07:00
Unknown
22c9294aa3 Phase 1 tweaks 2020-08-03 19:10:10 -04:00
Unknown
1f382c6cd7 Nerfs harm/disarm steppies 
- Reduces damage multiplier on harm steppies from 3.5 to 2.5
- Removes forcerest and halloss from disarm steppies. Replaces with weaken proc.
 2020-08-03 18:38:51 -04:00
Novacat
ad60bf1299 Merge pull request #8580 from Novacat/nova-pathfinder 
Unlimited Credit Sharing Range
 2020-08-03 17:07:12 -04:00