Commit Graph

20151 Commits

Author SHA1 Message Date
Victor Zisthus
aca04e1d65 Runtime Fix attempt 2 2022-06-06 14:02:45 -04:00
Victor Zisthus
45aaffb4fb Runtime fix
Probably. Unit tests will tell.
2022-06-06 13:23:29 -04:00
Casey
b249f87d8e Another pAI update 2022-06-05 22:02:24 +00:00
Casey
d251046e35 Brings fairness back to holodeck 2022-06-05 21:51:51 +00:00
Victor Zisthus
8e908ca1e9 Requested edits 2022-06-05 17:49:26 -04: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
Nadyr
1d004e4bb8 Merge branch 'master' into upstream-merge-13038 2022-06-04 20:23:28 -04:00
Nadyr
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
Nadyr
4a04dddd7d Merge pull request #4303 from CHOMPStation2/upstream-merge-13014
[MIRROR] Splits the scanners into separate files
2022-06-04 20:20:27 -04:00
Nadyr
78312516ba Merge pull request #4320 from CHOMPStation2/upstream-merge-13026
[MIRROR] Fix Telecomms machine browser and log browser.
2022-06-04 20:02:28 -04:00
Nadyr
97af724389 powder that makes you say yes 2022-06-04 19:50:46 -04:00
Casey
3d5d4f1be8 Makes new pAI obtainable 2022-06-04 20:03:22 +00:00
Casey
f958518ea9 Merge pull request #13035 from lm40/nogods
localizes religion and adds custom chaplain titles
2022-06-04 16:38:53 +00:00
Casey
4194d7d3e6 Fix Telecomms machine browser and log browser. 2022-06-04 16:20:07 +00:00
Casey
d3e0d8524c pAI and emote tweaks and upgrades 2022-06-04 10:00:21 +00:00
Verkister
49472b199a Fixes recursive explosions
Ancient-ass abandonware code finally updated to support multi-z and multiple explosions
2022-05-31 18:52:39 +03:00
Casey
f1122fd4b5 Duke's Mapping Competition: Burrito's Lake Map 2022-05-29 17:50:34 +00:00
Casey
e5cb4ab052 Splits the scanners into separate files 2022-05-29 17:45:06 +00:00
Verkister
52656780e5 Fixes explosions
At least worked fine on local in all tests and types of explosions i tested out (admin and weldertank) in wilderness and on station.
I suppose it had been a byond change after all that hadn't been quite as lenient with fucked up unindented archaic shapes of code.
Probably gonna shove it upstreams as well if it happens to do the trick on live as well.
2022-05-28 18:39:39 +03:00
Nadyr
540f40d0f2 Merge pull request #4283 from CHOMPStation2/upstream-merge-13002
[MIRROR] Plating can be built on most ground turfs.
2022-05-27 16:18:08 -04:00
Nadyr
9aa6caaedb Merge pull request #4282 from CHOMPStation2/upstream-merge-13000
[MIRROR] A couple more engineering QoL changes.
2022-05-27 16:17:18 -04:00
Nadyr
b7d722638a powder that makes you say yes 2022-05-27 15:56:27 -04:00
Nadyr
96b9b449fc powder that makes you say yes 2022-05-27 15:54:25 -04:00
Casey
501bb21152 Plating can be built on most ground turfs. 2022-05-22 18:30:08 +00:00
Casey
4aa0977f19 A couple more engineering QoL changes. 2022-05-22 18:24:54 +00:00
Casey
1ac9fe2449 Merge pull request #12998 from ItsSelis/selis-patch-10
Fixes Phaseshift "Gravity"
2022-05-22 18:23:48 +00:00
Rykka
553f1bba47 Missing Gun Sprite Fixes
- Fixes C20R missing sprite when empty
- Fixes Z8/Z9 missing sprite when empty
- Fixes Laser Cannon not having a sprite at all
- Fixes Xray Laser not having a sprite at all
- Fixes Anti-Particle Weapons (yes all of them) not having sprites
- Fixes Alien Pistol missing sprite + missing beam
- Fixes Mini-Uzi missing sprite when magazine removed/empty

Fixes https://github.com/CHOMPStation2/CHOMPStation2/issues/4101
2022-05-21 17:17:12 -06:00
Razgriz
e37400e1ac Merge pull request #3064 from Rykka-Stormheart/shep-dev-ambience-3.0
Update Ambient Sounds 3.0
2022-05-18 21:42:59 -07:00
Casey
61fce152d5 Merge pull request #12974 from foopwo/borgotoys
Adds a couple of new toys for cyborgs.
2022-05-15 20:15:29 +00:00
Novacat
4b4ba32e03 Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
2022-05-14 13:05:43 +00:00
Casey
9f6a9a4e6a Merge pull request #12897 from FartMaster69420/cocoon
Cocoon Metamorphosis
2022-05-12 19:21:53 +00:00
Razgriz
c3fdc6d677 Merge pull request #4227 from CHOMPStation2/upstream-merge-12934
[MIRROR] Chest -> Torso Targeting Fixes
2022-05-11 10:04:45 -07:00
Novacat
0eaa4a68ea Merge pull request #12943 from ItsSelis/selis-patch-pai
Allow numbers in pAI name
2022-05-10 14:53:07 +00:00
Novacat
24aa127d67 Chest -> Torso Targeting Fixes 2022-05-09 01:08:04 +00:00
Nadyr
0ccf97a237 Merge pull request #4221 from CHOMPStation2/upstream-merge-12925
[MIRROR] Adds chemistry kits
2022-05-08 14:42:45 -04:00
Nadyr
de3c078fad Merge pull request #4199 from CHOMPStation2/upstream-merge-12898
[MIRROR] Communicator Ringtones
2022-05-08 14:42:29 -04:00
Nadyr
d31e26dcba Merge pull request #4220 from CHOMPStation2/upstream-merge-12923
[MIRROR] Shuttle fixes
2022-05-08 11:18:07 -04:00
Nadyr
76627b4664 Merge pull request #4213 from CHOMPStation2/upstream-merge-12896
[MIRROR] Fixes some issues with DNA code
2022-05-08 11:11:32 -04:00
Nadyr
6c87352aa5 Merge pull request #4211 from CHOMPStation2/upstream-merge-12888
[MIRROR] The pAI, Bot, and Microwave Tweaks
2022-05-08 11:10:07 -04:00
Nadyr
d4ef291152 Merge pull request #4209 from CHOMPStation2/upstream-merge-12881
[MIRROR] Pocket pouch rebalance + obtaining method
2022-05-08 11:08:37 -04:00
Casey
16b58a8b18 Adds chemistry kits 2022-05-08 09:57:10 +00:00
Casey
d22210bc80 Shuttle fixes 2022-05-08 09:56:01 +00:00
Casey
169147e55a Merge pull request #12896 from FartMaster69420/dna-patch
Fixes some issues with DNA code
2022-05-08 09:49:09 +00:00
Casey
fbd967128d Merge pull request #12888 from FartMaster69420/pai_and_bots
The pAI, Bot, and Microwave Tweaks
2022-05-08 09:46:55 +00:00
Casey
ff911924b5 Merge pull request #12881 from TankTheBirb/master
Pocket pouch rebalance + obtaining method
2022-05-08 09:44:33 +00:00
Novacat
4df1e6ba74 Merge pull request #12903 from ItsSelis/selis-guestpass-patch
Guestpass Patch
2022-05-06 16:45:50 +00:00
Novacat
5bffcf5062 Communicator Ringtones 2022-05-05 00:44:55 +00:00
Nadyr
19da7df9b5 Merge pull request #4192 from CHOMPStation2/upstream-merge-12861
[MIRROR] Fixing Stack Deletion
2022-05-01 18:17:18 -04:00
Nadyr
978e9cb5a5 Merge pull request #4184 from CHOMPStation2/upstream-merge-12856
[MIRROR] Quick GB tweaks
2022-05-01 18:05:02 -04:00
Nadyr
6373935f07 Merge pull request #4166 from CHOMPStation2/upstream-merge-12837
[MIRROR] Stonks!
2022-05-01 18:04:49 -04:00