cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,309 Commits 10 Branches 0 Tags
c55f47fe64369aa801c5a5642f05cdc7f59b135a
Commit Graph

25588 Commits

Author SHA1 Message Date
Novacat
c55f47fe64 Merge pull request #8778 from VOREStation/upstream-merge-7534 
[MIRROR] Emergency Travis Appeasement: Sacrifice of one Giant Spider, one HMS Jolly Pip, and one Capital City sacked and looted by Cultists
 2020-08-21 01:41:39 -04:00
Atermonera
0ebcca246e Merge pull request #7518 from Meghan-Rossi/borgcookfix 
Fix cyborgs not being able to cook
 2020-08-21 01:25:40 -04:00
Novacat
d63f0b2c3e Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat 
Adds Mech Toy Battles!
 2020-08-21 01:14:42 -04:00
Novacat
89b0fa6b79 Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch 
Persistence Patch
 2020-08-21 01:14:04 -04:00
Novacat
52e67d6ed2 Merge pull request #8763 from VOREStation/upstream-merge-7488 
[MIRROR] Ports more Teshari clothes from Urist & Citadel
 2020-08-21 01:12:20 -04:00
Novacat
9207c1dd50 Merge pull request #8764 from VOREStation/upstream-merge-7492 
[MIRROR] Skrell blood is now hemocyanin-based
 2020-08-21 01:12:00 -04:00
Novacat
c41e350d6d Merge pull request #8768 from VOREStation/upstream-merge-7497 
[MIRROR] Cancelling choosing someone to admin PM won't say "no mob"
 2020-08-21 01:11:43 -04:00
Novacat
dc48492db5 Merge pull request #8774 from VOREStation/upstream-merge-7509 
[MIRROR] Stop bots standing around blocking doors
 2020-08-21 01:11:26 -04:00
Novacat
a117c4efc6 Merge pull request #8761 from VOREStation/upstream-merge-7487 
[MIRROR] Adds shift-middle click pointing
 2020-08-21 01:09:36 -04:00
Novacat
373b61c33c Merge pull request #8772 from VOREStation/upstream-merge-7503 
[MIRROR] Replaces cable attack_ghost with normal examine
 2020-08-21 01:08:43 -04:00
Atermonera
e89409e64b Emergency Travis Appeasement: Sacrifice of one Giant Spider, one HMS Jolly Pip, and one Capital City sacked and looted by Cultists 2020-08-21 00:12:11 -04:00
Meghan-Rossi
133296814a Stop bots standing around blocking doors (#7509) 
* Idle bots will move out of doorways

Idle bots will move out of doorways, including turfs with firedoors or blastdoors.

* +changelog

* fix parentheses
 2020-08-20 22:32:09 -04:00
Atermonera
08cc205c35 Merge pull request #7503 from Cyantime/patch-2 
Replaces cable attack_ghost with normal examine
 2020-08-20 22:24:32 -04:00
Atermonera
4f0f345647 Merge pull request #7507 from listerla/shieldgen 
De-capitalizes shield generators
 2020-08-20 22:24:21 -04:00
Atermonera
45b1b77f42 Merge pull request #7497 from Shadow-Quill/AdminPM 
Cancelling choosing someone to admin PM won't say "no mob"
 2020-08-20 22:21:42 -04:00
listerla
85536ea0fd Skrell blood is now hemocyanin-based (#7492) 
* Skrell blood is now hemocyanin-based

Inspired by Aurora

* Update Chemistry-Reagents-Dispenser.dm

* Create Lorilili - hemocyanin.yml
 2020-08-20 22:17:58 -04:00
listerla
ebbea6ebc8 Ports more Teshari clothes from Urist & Citadel (#7488) 
* Ports more Teshari clothes from Urist & Citadel

* Accidentally deleted one sprite, undeleting now
 2020-08-20 22:16:42 -04:00
listerla
7e65840937 Adds shift-middle click pointing (#7487) 
* Adds shift-middle click pointing

* Borgs and buckled folk can now point

* Create Lorilili - pointing.yml
 2020-08-20 22:15:16 -04:00
Atermonera
9c966b934c Merge pull request #7428 from lbnesquik/Kot-Borg-Tweak 
Small tweaks to cyborg verbs and icon
 2020-08-20 21:23:52 -04:00
Novacat
283db98f36 Merge pull request #8726 from Rykka-Stormheart/shep-dev-spicy-fewd 
Adds Spice Resistence/Intolerance Traits, Makes Frost Oil COLD
 2020-08-20 18:54:05 -04:00
ShadowLarkens
02bb4637eb TGUI Point Defense Mainframe & Advanced Shield Generator 2020-08-18 20:42:59 -07:00
ShadowLarkens
48b630891e TGUI Overmap Shuttle Controls 2020-08-18 20:42:12 -07:00
Novacat
2cb854cb1b Merge pull request #8731 from ShadowLarkens/tgui_security 
TGUI Security
 2020-08-18 23:41:32 -04:00
Novacat
4b44d10d34 Merge pull request #8366 from lbnesquik/Kot-Traits-Addition 
Bring back hemophilia. No, it's not a crime!
 2020-08-18 20:49:44 -04:00
ShadowLarkens
c4843f023a Add other plane masters that were missed to fix camera consoles displaying stuff they shouldn't 2020-08-18 14:26:04 -07:00
Novacat
95044666b0 Merge pull request #8737 from Rykka-Stormheart/shep-dev-nt-uniform-fix 
Fixes Nanotrasen Uniforms to account for Solgov Path Changes
 2020-08-18 17:15:45 -04:00
ShadowLarkens
61faa8057c Brig timer adjustment & camera console panning 2020-08-18 13:47:43 -07:00
Rykka
c65b29e9fc Fixes Nanotrasen Uniforms to account for Solgov Path Changes 
This was introduced thanks to a PR in mid-2019, and NT Sec/etc uniforms had been broken since then.

Screenshot of broken uniforms:
![](https://i.imgur.com/AVii80Z.png)

As of now, the in-hand sprite is the only one that's 'broken', display JSUIT on your sprite, but the actual UI in-hand works, the on-ground works, the on-mob works, so frankly, after two+ hours, I'm calling it good here.

This fixes all derivative NT uniforms too.
 2020-08-18 12:09:11 -04:00
ShadowLarkens
39fd76aafb TGUI Dna Scanner 2020-08-18 07:58:00 -07:00
Novacat
8079ce2f0f Merge pull request #8720 from ShadowLarkens/tgui_cargo 
TGUI Cargo
 2020-08-18 09:48:13 -04:00
Novacat
c8f8d4728d Merge pull request #8733 from VOREStation/upstream-merge-7477 
[MIRROR] Replaces bolt sounds for rigs with servo sounds
 2020-08-17 20:10:34 -04:00
Novacat
5dfbc1ba18 Merge pull request #8732 from VOREStation/upstream-merge-7473 
[MIRROR] Exosuit Upkeep
 2020-08-17 20:10:18 -04:00
Novacat
7d1518fc0c Merge pull request #8730 from VOREStation/upstream-merge-7470 
[MIRROR] Admin ghosts can now examine other ghosts to pull up admin tools!
 2020-08-17 20:09:54 -04:00
Atermonera
a826af32d1 Merge pull request #7477 from listerla/servosound 
Replaces bolt sounds for rigs with servo sounds
 2020-08-17 18:25:13 -04:00
Mechoid
ccd5993b38 Exosuit Upkeep (#7473) 
* Exosuit upkeep, lower slowdown of Durand and Gygax components, guns now slow far less.

* Time time time.

* Seeds survive. For now.
 2020-08-17 18:19:51 -04:00
Atermonera
e21b1b158f Merge pull request #7470 from Rykka-Stormheart/admin-ghost-examine-QOL 
Admin ghosts can now examine other ghosts to pull up admin tools!
 2020-08-17 18:09:20 -04:00
SubberTheFabulous
eb48eef20e Adds New Prosthetics Set (#7467) 
* Adds a new FBP CS set, removes old alt2

* Adds a new FBP CS set, removes old alt2

* Readds Cyber Solutions - Array

* Readds Cyber Solutions - Array

* Adds a new FBP CS set

Changelog
 2020-08-17 18:04:54 -04:00
Rykka
d21151062f VOREStation Edit - Remove Spices canceling each other out 2020-08-17 08:25:37 -04:00
Rykka
38dcada5d8 Forgot the M.species. 2020-08-17 08:14:58 -04:00
Rykka
f059c396eb Adds Spice Resistence/Intolerance Traits, Makes Frost Oil COLD 
- Spice Resistance traits in the same flavor as Booze traits. 
- 3x, 2x, 1.5x, 0.75x, 0.5x, 0.25x resistance to the effects of capsaicin and frost oil.
- Frost Oil and Capsaicin will now **lower/increase your body temperature by a random amount** during the ingest step if you're over the danger threshold.
- var/spice_mod is added to the species datums, much like alcohol mod.
- Frost Oil will now remove 5 capsaicin on affect_ingest much like capsaicin would remove 5 frostoil.

Not much else to say.
I got tired of keeling over in agony after eating spicy food, and frankly, this is an RP server, so mechanical hardlimits on characters that canonically power down spicy food without giving a shit is frustrating to say the least.

All changes minus the neutral traits will be PR'd to Polaris.
 2020-08-17 08:07:03 -04:00
ShadowLarkens
9cd0f5b086 Fix survey vendor 2020-08-16 22:27:53 -07:00
ShadowLarkens
1ff5627f47 TGUI Shuttle Consoles 2020-08-16 22:27:09 -07:00
ShadowLarkens
3d21087f8b TGUI Asteroid Belt Scanning Console 2020-08-16 22:27:09 -07:00
ShadowLarkens
d769358194 TGUI Stacking Machine 2020-08-16 22:27:09 -07:00
ShadowLarkens
5bbd5334b6 TGUI GPS & Mining Vendor & Ore Processing Console 2020-08-16 22:27:09 -07:00
ShadowLarkens
510162d2d5 TGUI Mining Equipment Vendor 2020-08-16 22:27:08 -07:00
ShadowLarkens
aea68811f6 TGUI Request Console (and Fix TGUI verb) 2020-08-16 22:27:08 -07:00
ShadowLarkens
0231088057 TGUI Notice Board 2020-08-16 22:27:08 -07:00
ShadowLarkens
dd088ae636 TGUI Mulebot 2020-08-16 22:27:08 -07:00
ShadowLarkens
6f9545ea63 TGUI Destination Tagger 2020-08-16 22:27:08 -07:00