cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,066 Commits 7 Branches 0 Tags
90f4c40a9c9e021cc99100a5ab2ff11d80787197
Commit Graph

25495 Commits

Author SHA1 Message Date
Novacat
90f4c40a9c Merge pull request #8671 from VOREStation/upstream-merge-7441 
[MIRROR] Rename the shield drone to linear combat shield in mech fab.
 2020-08-12 14:54:50 -04:00
Novacat
9882285544 Merge pull request #8670 from VOREStation/upstream-merge-7440 
[MIRROR] Allows non-base welders to remove graffiti
 2020-08-12 14:54:35 -04:00
Novacat
8658100fba Merge pull request #8669 from VOREStation/upstream-merge-7431 
[MIRROR] ports a whole lot of Teshari stuff from Arkstation
 2020-08-12 14:54:22 -04:00
Atermonera
c4621602a3 Merge pull request #7441 from lbnesquik/Kot-MEchfab-staff 
Rename the shield drone to linear combat shield in mech fab.
 2020-08-12 14:19:44 -04:00
Atermonera
9bc7b15585 Merge pull request #7440 from Cyantime/patch-2 
Allows non-base welders to remove graffiti
 2020-08-12 14:18:27 -04:00
Greenjoe12345
ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -04:00
Atermonera
ccf38e3c9e Merge pull request #7405 from Mechoid/Mortiferin 
Mortiferin
 2020-08-12 14:03:17 -04:00
Verkister
4df72d1052 Merge pull request #8629 from ShadowLarkens/tgui_engineering_less_travis_bork 
TGUI Engineering: Less broken Travis Edition (🤞)
 2020-08-12 15:12:44 +03:00
Novacat
d4637a1e52 Merge pull request #8659 from VOREStation/Verkister-patch-1 
Fixes synth brain transplant forcing bad real_name
 2020-08-11 23:01:24 -04:00
Rykka
4b4eaa428f Adds Hyena Cackle Emote - Standalone 
This allows for merging this separately/earlier than #8658.

Adds a hyena cackle emote for all our yeen friends out there.

YEENS ARE NOT ALL STIMKY. :U
 2020-08-11 08:25:09 -04:00
Verkister
001e53596d better way 2020-08-11 15:14:06 +03:00
Verkister
bfbdc686df Fixes synth brain transplant forcing bad real_name 
-Fixes the synth brain transplant rename prompt being a) broken, and b) having the capability to force a contaminated and unsanitized real_name var for the body, which in turn has the capability to kill regex and cause big issues.

In other words: an unnamed synth body wearing a person's ID gets their display name shown as "Unknown (as name)". The problematic part is that the brain transplant procedure here forces the new body to rename itself by the copied display name, AND also forces the real_name var into that without sanitizing. This causes the chat mention system to divide the unsanitized name into 3 names "Unknown", "(as", and "name)" and to shove these into regex to look for, and the rogue () in the names makes regex commit die and likely also break map loading and stuff.
 2020-08-11 14:59:21 +03:00
Novacat
0a6f8c413a Merge pull request #8645 from Verkister/hors 
Adds new horse mob.
 2020-08-10 06:43:15 -04:00
ShadowLarkens
9213f2cc81 Fix play_ambience in Life() causing premature loops 2020-08-10 03:00:57 -07:00
Cyantime
1ccbf75ac9 Fix mob_spawner death checking 2020-08-09 22:11:20 -04:00
Verkister
e9a3fc9c70 Adds new horse mob. 
Bigger, faster, stronger, and hungrier than the old little horse. Also obviously mountable.
 2020-08-09 15:04:57 +03:00
ShadowLarkens
951f37d2e3 TGUI Engineering: Squashed Edition (Commits Below) 
TGUI APCs

 TGUI vending machines

 Fix AI default_tgui_interaction

 TGUI Airlocks

 Station & Atmospheric Alert TGUI + Misc NTOS-TGUI Fixes

 TGUI Air Alarms & Central Atmospheric Control

 Airlock TGUI

 TG... got rid of UI for fire alarm. í´·

 TGUI Gas Heating/Cooling System

 TGUI Gas Pump & Passive Gate + Fixes

 TGUI Omni Atmospherics

 TGUI Pipe Dispensers & RPD

 TGUI IntelliCore & Vending Fix

 TGUI Handheld Tanks

 TGUI Portable Pump & Scrubber

 TGUI Tank Dispenser & Canisters

 TGUI Radios

 TGUI SMES & Air Alarm adjustment

 Tweak vending machine interfaces a tad

 TGUI Algae Farm

 TGUI general_air_control

 - Distro & Waste Console
 - Riot Control Console
 - Atmos Intake Console
 - Engine Cooling Console

 TGUI Heavy Scrubber Control (and body scanner fix)

 TGUI trinary devices & shutoff monitor

 TGUI Telecomms Log Browser

 TGUI Telecomms Machine Browser

 TGUI Spaceheater Internal Panel

 TGUI Gravity Generator

 TGUI Id Cards & Fix ID Card Images

 TGUI Id Card Redesign

 TGUI Turbolift

 TGUI Suit Cycler & Suit Storage Unit & Vending Fixes

 TGUI Power Monitor

 TGUI Signalers

 TGUI Employment Records

 TGUI Drone Console

 TGUI RIGSuits

 TGUI PA & PACMAN, and Margin Fix

 TGUI Solar Panels & Fix Power Monitor

 Adjust TGUI modules & their interaction with NTOS

 TGUI RCON

 TGUI Message Monitor

 Bump TGUI line limit to 120 (ParadiseSS13/Paradise#14002)

 TGUI Exonet & NTNet Relay

 TGUI Telecomms Multitool Menu

 TGUI Shield Capacitor & Shield Generator

 TGUI Supermatter-everything & Refactors
 2020-08-09 04:46:31 -07: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