Commit Graph
1791 Commits
Author SHA1 Message Date
CaseyandCHOMPStation2 e89b36dfc9 Merge pull request #13812 from Cameron653/PSG-HOTFIX
Fixes inability to use multitool on upgraded shields
2022-10-02 17:53:59 +00:00
RazgrizandGitHub 53f1977360 Merge pull request #5022 from CHOMPStation2/I-will-give-you-1000-dollars-to-stop-changing-gun.dmi
[Manual MIRROR] Release Bugfixes and changes (MERGE BEFORE RELEASE)
2022-09-23 00:32:38 -07:00
RazgrizandGitHub d8f4e21f43 Accidentally left in an ineffectual if statement 2022-09-23 00:19:50 -07:00
Razgriz cf301c6346 [Manual MIRROR] Release Bugfixes and changes (MERGE BEFORE RELEASE)
Unfucks https://github.com/CHOMPStation2/CHOMPStation2/pull/5019 due to yet another github merge conflict with a god damn .dmi file. Missing map files, but that's ok because that's for virgo specific maps.
2022-09-23 00:14:16 -07:00
RazgrizandGitHub 91fd231d78 Merge pull request #4989 from CHOMPStation2/upstream-merge-13769
[MIRROR] Radiation Rework
2022-09-22 21:14:38 -07:00
RazgrizandGitHub 7115a266a8 Merge pull request #4980 from CHOMPStation2/upstream-merge-13696
[MIRROR] Adds personal shield generators. [READY FOR MERGE]
2022-09-22 21:14:20 -07:00
RazgrizandGitHub dff419e979 powder that makes you say yes 2022-09-22 20:48:02 -07:00
CaseyandCHOMPStation2 de491df7b7 Radiation Rework 2022-09-23 00:56:28 +00:00
CaseyandCHOMPStation2 870ef78b24 Merge pull request #13767 from Heroman3003/lang-autosay
Fixes a few bugs/runtimes
2022-09-23 00:54:48 +00:00
CaseyandCHOMPStation2 524cd2e671 Adds personal shield generators. [READY FOR MERGE] 2022-09-23 00:53:41 +00:00
Victor Zisthus 2ef8a69d9a Defib Buff
Removes the mental interface error on defibs.

Nothing is more annoying for players, medical and patient alike, for an OOC issue to bleed into an in-character one.

A brief bout of afk frustration or loss of internet leading medical to try and revive you using many chems, then giving up an leaving you for dead... A Search and Rescue going out to rescue someone in such a state... Why punish players of medical for doing their job with a no-sale at the absolute last step?

Bonus points, monkey's are now revivable. Yay!
2022-09-09 19:36:28 -04:00
CaseyandCHOMPStation2 ceca2956e1 Merge pull request #13671 from Cameron653/light_overlay
More light updates!
2022-09-06 19:44:48 +00:00
CaseyandCHOMPStation2 514d5def1e Merge pull request #13655 from Heroman3003/ghostcomm
Fixes ghost comms runtime probably
2022-09-04 21:49:12 +00:00
CaseyandCHOMPStation2 d99af385b6 Merge pull request #13576 from Cameron653/flashlight_runtimefix
Makes flashlights not runtime.
2022-08-25 23:01:29 +00:00
NadyrandGitHub fe0cdde265 powder that makes you say yes 2022-08-01 20:40:27 -04:00
CaseyandCHOMPStation2 ac204e7749 Replaces some old code w/ IsAdvancedToolUser and fixes twohanded weapons for simple_mobs 2022-07-29 20:48:29 +00:00
CaseyandCHOMPStation2 48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
KasscandGitHub 9d620f4096 Merge pull request #4329 from VictorZisthus/majormapedits
Massive Broad Scope Changes
2022-07-13 19:02:32 -04:00
CaseyandDarlantan d1863ff7ab Communicator Reply Messages 2022-07-03 21:29:21 -04:00
CaseyandCHOMPStation2 3222c997a4 Merge pull request #13235 from Runa-Dacino/TVCamera_Port_synced
Ports ability to make press camera drones
2022-07-02 05:09:35 +00:00
NadyrandGitHub e4266fbf08 Merge branch 'master' into upstream-merge-13199 2022-06-30 17:31:02 -04:00
CaseyandCHOMPStation2 e8b45184d2 A pAI death tweak I forgot! 2022-06-29 06:22:16 +00:00
CaseyandCHOMPStation2 285b424a75 Death of pAIs!!! 2022-06-29 05:58:53 +00:00
NadyrandGitHub 0c9b70b451 Merge pull request #4414 from CHOMPStation2/upstream-merge-13160
[MIRROR] Account for Sleevecards and mild pAI use screen revamp
2022-06-25 16:25:40 -04:00
CaseyandCHOMPStation2 d607a8a3c5 Merge pull request #13160 from Very-Soft/accountforsleevecards
Account for Sleevecards and mild pAI use screen revamp
2022-06-25 02:31:55 +00:00
CaseyandCHOMPStation2 82ba349c54 Merge pull request #13152 from TankTheBirb/holster-pais
pAIs can now be holstered!
2022-06-24 00:02:04 +00:00
NadyrandGitHub 9764d2aae1 Merge pull request #4407 from CHOMPStation2/upstream-merge-13150
[MIRROR] Fixes more runtimes
2022-06-23 17:50:49 -04:00
CaseyandCHOMPStation2 79f5dc9c3f Merge pull request #13150 from Heroman3003/runtime-2
Fixes more runtimes
2022-06-23 10:43:41 +00:00
CaseyandCHOMPStation2 68c3469d60 ALL runtimes 2022-06-23 09:41:56 +00:00
NadyrandGitHub 7f9bb6e91d powder that makes you say yes 2022-06-23 00:01:53 -04:00
NadyrandGitHub 0d15d88972 powder that makes you say yes 2022-06-23 00:01:30 -04:00
CaseyandDarlantan 5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
NadyrandGitHub b4c293749b Merge pull request #4399 from CHOMPStation2/upstream-merge-13136
[MIRROR] pAI QOL
2022-06-22 23:24:47 -04:00
NadyrandGitHub f5aaf3ceb3 Merge pull request #4389 from CHOMPStation2/upstream-merge-13124
[MIRROR] New pAI verb
2022-06-22 23:00:32 -04:00
NadyrandGitHub 482c26da37 Merge branch 'master' into upstream-merge-13124 2022-06-22 22:47:53 -04:00
NadyrandGitHub a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
CaseyandCHOMPStation2 3d8594ff54 pAI QOL 2022-06-21 10:35:42 +00:00
CaseyandCHOMPStation2 9ba4b8a665 New pAI verb 2022-06-19 12:44:43 +00:00
CaseyandCHOMPStation2 b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
CaseyandCHOMPStation2 928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
NadyrandGitHub fd9fe65610 Merge branch 'master' into upstream-merge-13063 2022-06-11 17:45:04 -04:00
NadyrandGitHub 80fe41605c Merge pull request #4339 from CHOMPStation2/upstream-merge-13056
[MIRROR] Tiny PDA UI Fix & Communicator Changes
2022-06-11 17:42:23 -04:00
CaseyandCHOMPStation2 a6c21a9adb Communicator Log Fix 2022-06-11 01:04:29 +00:00
CaseyandCHOMPStation2 cacb0de75a Tiny PDA UI Fix & Communicator Changes 2022-06-09 16:33:06 +00:00
CaseyandCHOMPStation2 9f53218332 Yet more pAI tweaks! 2022-06-07 03:38:57 +00:00
NadyrandGitHub 985216ba9e powder that makes you say yes 2022-06-06 18:25:13 -04:00
CaseyandCHOMPStation2 b249f87d8e Another pAI update 2022-06-05 22:02:24 +00:00
Victor Zisthus 4704df506b Massive Broad Scope Changes
NEW STUFF
Added in a custom thermal regulator for the wilderness shelter.

Southern Cross now has a Bluespace Radio!

Added a subspace radio, and allowed it to be made in the autolathe.

ALL MAPS:
Added lighting to dark areas. Did not touch lighting in maintenance areas.

DECK ONE:
Adjusted exterior lattice network.

DECK TWO:
Fixed a bug with Shieldgen.

Moved the Engine SMES powernet sensor off of a pump.

Removed the second freezer air alarm to prevent pressure alarms from going off every shift. (I got my revenge on the laws of thermodynamics with the new custom regulator, don't worry.)

Put a new subspace radio in the bar.

Adjusted exterior lattice network.

DECK THREE:
Removed a duplicate shower curtain in one of the dorm rooms.

SURFACE OUTPOST:
This PR will cause a conflict with #4061 but I am willing to help Enzo with the project as needed~

A friend and boy waits for the miners every shift.

Moved some stuff around at surface S&R per a reported issue. FIXES #4072

Fixed a bug with the hunting lockers and doors. Security should have access to them now.

Fixed a bug with the Hunting Pen shield generators.

CAVES:
Cleared the rock around the outpost, added a new door to allow moving around the exterior.

EXPLO CARRIER:
Put the new Bluespace Radio on the table in the gateway prep room.

WILDERNESS + SKY ISLANDS:
Overhauled the wilderness shelter! It now has a crew quarters room, First Aid, a second floor, and a utility room. It's only powered by a single advanced RTG that's barely able to keep up with power demand when the place is abandoned, so be sure to bring resources from mining and science to get the other RTG's up and running!
2022-06-04 23:52:22 -04:00
NadyrandGitHub 1d004e4bb8 Merge branch 'master' into upstream-merge-13038 2022-06-04 20:23:28 -04:00
NadyrandGitHub ddc0c05b1f Merge pull request #4318 from CHOMPStation2/upstream-merge-13031
[MIRROR] pAI and emote tweaks and upgrades
2022-06-04 20:20:56 -04:00