cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-10 01:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,732 Commits 7 Branches 0 Tags
5b51a657d42228f559d974c8fc20b0ee18c6456d
Commit Graph

9861 Commits

Author SHA1 Message Date
Bib Bob
8eeac28d4f wtf 2023-07-12 19:24:34 -05:00
Bib Bob
b93658a995 Kassc's map changes + atmos fix 2023-07-12 10:04:51 -05:00
Aroliacue
d89d84a64d Oops 2023-07-12 11:27:15 +10:00
Bib Bob
320b588116 map changes 2023-07-11 19:22:47 -05:00
Bib Bob
d279202fc3 another one 2023-07-10 22:21:17 -05:00
Bib Bob
55a1957f9e oops, missed a decal. 2023-07-10 22:18:38 -05:00
Bib Bob
0f31dd8a0b Adds a chem distiller 2023-07-10 22:09:23 -05:00
Kassc
504539b2f7 TechStorage Circuits 
Adds over a dozen of circuits all pertaining to engineering. If there are any circuits that I missed that Engineering can use, note me!

```/obj/item/weapon/circuitboard/machine/rtg
/obj/item/weapon/circuitboard/machine/rtg/advanced
/obj/item/weapon/circuitboard/machine/reg_c
/obj/item/weapon/circuitboard/tesla_coil (many)
/obj/item/weapon/circuitboard/grounding_rod (many)
/obj/item/weapon/circuitboard/mass_driver
/obj/item/weapon/circuitboard/pointdefense
/obj/item/weapon/circuitboard/pointdefense_control
/obj/item/weapon/circuitboard/solar_control,
/obj/item/weapon/circuitboard/pacman
/obj/item/weapon/circuitboard/pacman/super
/obj/item/weapon/circuitboard/fusion_core
/obj/item/weapon/circuitboard/fusion_core_control
/obj/item/weapon/circuitboard/fusion_fuel_control
/obj/item/weapon/circuitboard/fusion_injector (5x)
/obj/item/weapon/circuitboard/gyrotron
/obj/item/weapon/circuitboard/gyrotron_control
/obj/item/weapon/circuitboard/fusion_fuel_compressor
/obj/item/weapon/circuitboard/machine/power_compressor
/obj/item/weapon/circuitboard/machine/power_turbine
/obj/item/weapon/circuitboard/turbine_control
/obj/item/weapon/circuitboard/recycler_crusher
/obj/item/weapon/circuitboard/recycler_sorter
/obj/item/weapon/circuitboard/recycler_stamper
/obj/item/weapon/circuitboard/rcon_console
/obj/item/weapon/circuitboard/telecomms/processor,
/obj/item/weapon/circuitboard/telecomms/receiver,
/obj/item/weapon/circuitboard/telecomms/server,
/obj/item/weapon/circuitboard/telecomms/bus,
/obj/item/weapon/circuitboard/telecomms/broadcaster,
/obj/item/weapon/circuitboard/telecomms/exonet_node,
/obj/item/weapon/circuitboard/communications
/obj/item/weapon/circuitboard/candymachine
/obj/item/weapon/circuitboard/microwave
/obj/item/weapon/circuitboard/oven
/obj/item/weapon/circuitboard/fryer
/obj/item/weapon/circuitboard/cerealmaker
/obj/item/weapon/circuitboard/grill
/obj/item/weapon/circuitboard/algae_farm
/obj/item/weapon/circuitboard/thermoregulator
/obj/item/weapon/circuitboard/shield_diffuser (many)
/obj/item/weapon/circuitboard/arf_generator (MANY)
/obj/item/weapon/circuitboard/unary_atmos/heater
/obj/item/weapon/circuitboard/unary_atmos/cooler
/obj/item/weapon/circuitboard/batteryrack
/obj/item/weapon/circuitboard/smes
/obj/item/weapon/circuitboard/grid_checker
/obj/item/weapon/circuitboard/breakerbox
/obj/item/weapon/circuitboard/atmos_alert
/obj/item/weapon/circuitboard/air_management
/obj/item/weapon/circuitboard/rcon_console
/obj/item/weapon/circuitboard/powermonitor
/obj/item/weapon/circuitboard/shutoff_monitor
/obj/item/weapon/circuitboard/air_management
/obj/item/weapon/circuitboard/air_management/tank_control
/obj/item/weapon/circuitboard/air_management/supermatter_core
/obj/item/weapon/circuitboard/air_management/injector_control```
 2023-07-10 15:47:37 -04:00
Kassc
6f2bf8aae7 Merge pull request #6472 from SlaysInCode/Southern-Cross-The-Armory-Update 
Southern Cross: The Vault Update
 2023-07-10 14:22:00 -04:00
Heroman3003
d223f00aeb Merge pull request #15134 from KillianKirilenko/kk-teststuff 
Minitest Map Engine Core
 2023-07-10 04:04:45 +00:00
Raeschen
a77566d2fa Merge pull request #6505 from CHOMPStation2/upstream-merge-15112 
[MIRROR] Adds new Debris Field POI: Phoron Tanker!
 2023-07-06 23:06:05 +02:00
Raeschen
e7a564ac15 Update _debrisfield.dm 2023-07-06 22:50:04 +02:00
Raeschen
b987a8eabc undo a mapcheck 2023-07-06 18:49:57 +02:00
Raeschen
ead015c3cd revert some checkers 2023-07-06 14:56:13 +02:00
Raeschen
040112bbe6 add some maps for maptest, fix missing paths in vr 2023-07-06 14:13:23 +02:00
Raeschen
2b35e876cc fixes some runtimes 2023-07-06 13:46:18 +02:00
Razgriz
c328707a52 Merge pull request #6504 from CHOMPStation2/upstream-merge-15111 
[MIRROR] Health Analyzer post-guidance improvements
 2023-07-06 00:33:39 -07:00
Razgriz
71442ce5f6 Fix: Separate dorms air system from the rest of deck 3 air 2023-07-05 18:15:20 -07:00
Casey
568d1fed14 Adds new Debris Field POI: Phoron Tanker! 2023-07-05 22:28:58 +00:00
Casey
f62a1c4300 Health Analyzer post-guidance improvements 2023-07-05 22:26:47 +00:00
Fluff
866b31da0e Merge remote-tracking branch 'origin/BaseBlep' into BranchBlep 2023-07-05 08:42:57 -04:00
Fluff
2f51287f62 Fixing stuff 
title
 2023-07-05 08:42:46 -04:00
FluffMedic
969f4ca7cc Merge branch 'master' into BaseBlep 2023-07-05 07:59:44 -04:00
Raeschen
2f18685407 Merge pull request #6500 from CHOMPStation2/upstream-merge-15109 
[MIRROR] Medical Guidance
 2023-07-05 12:42:18 +02:00
Raeschen
d7b594d3ed Merge pull request #6494 from CHOMPStation2/upstream-merge-15106 
[MIRROR] Tweaks and tidying
 2023-07-05 12:27:56 +02:00
Raeschen
df039e7c9c revert test vars 2023-07-05 12:12:23 +02:00
Raeschen
cf1af2d462 even more bad paths 2023-07-05 11:53:01 +02:00
Raeschen
887c2e07aa revert dogbasealt 2023-07-05 11:41:42 +02:00
Raeschen
81b117b889 even more path fixes 2023-07-05 11:35:45 +02:00
Raeschen
ec1fd1807d more missing paths 2023-07-05 11:15:41 +02:00
Raeschen
2c9b7b1a59 mass renaming everything is a good thing right??? 2023-07-05 10:33:37 +02:00
Raeschen
3e0a0c0c98 big resync + merge conflicts 2023-07-05 10:12:39 +02:00
Casey
e2fb4081d0 Medical Guidance 2023-07-04 23:21:27 +00:00
Digi Purpur
6c0d9761fa Minor fixes! 
- Going to test before I push, but otherwise...
 - Beaker in maint replaced with a stopperbottle.
 2023-07-03 17:57:36 -07:00
Digi Purpur
5fcc07b93d General Change (Commit Pass) 
- Not yet finished.
 - Need to test a build!
 - Need to make sure "that" beaker doesn't spawn with sulfuric acid :)
 2023-07-03 17:55:17 -07:00
Casey
19550009ce Tweaks and tidying 2023-07-03 10:24:10 +00:00
Raeschen
871c0f5425 Merge pull request #6483 from CHOMPStation2/upstream-merge-15098 
[MIRROR] Randomness updates
 2023-07-02 15:45:09 +02:00
TheGreatKitsune
25048b7463 Fix shadekin dark hideout and a few other changes to it 2023-07-01 17:31:07 -05:00
Casey
4cefffe8f4 Merge pull request #15098 from Very-Soft/redgate 
Randomness updates
 2023-07-01 22:31:02 +00:00
Aroliacue
80c4fd742a Fixes Wiring 2023-07-01 15:29:28 +10:00
SlaysInCode
5bd96bab01 Southern Cross: The Armory Update 
Hello! Local Security Dragon here with yet another Security update!

This one involves out lovely, and at this moment, rather poorly defended Vault! This update gives not only a joyful layer of protection, but also grants us more RP chances and a new area.

What has been done:

- The Vault is now equipped with a Cycler, much like the one leading into Xenobiology, or Virology.

- Turrets have been installed for an extra layer of protection.

- A Security Checkpoint located just outside the Vault for better protection. Security Camera Console and Records on-site, making it another good post for our lovely Security! The Checkpoint is also equipped with two lockdown switches. One for the Vault itself, and one for the checkpoint.

- A Lounge just outside the checkpoint for those with business there or those who just want a new place to relax.

- Two new \area\'s have been added. Vault Checkpoint, and Vault Lounge.

- The escape pods that were once across from the vault were relocated to where the old gym was.
 2023-06-28 01:48:24 -04:00
Fluff
a8a32f7651 Shrinking and adjustments to mob Ai 
Title
 2023-06-27 17:39:30 -04:00
Casey
865355b31c Map 
rebase to master
 2023-06-27 14:20:00 +02:00
Casey
4e24a596f2 Remove access from tavern 
rebase to master
 2023-06-27 14:06:35 +02:00
Raeschen
1a9f8d33e2 Merge pull request #6464 from CHOMPStation2/upstream-merge-15084 
[MIRROR] Little redgate update
 2023-06-27 14:04:24 +02:00
Raeschen
f59af81ae0 Merge pull request #6468 from SlaysInCode/Get-out-of-Brig-free-card-removal 
Get out of Brig free card Removal
 2023-06-27 14:03:45 +02:00
Casey
996f8483cc Little redgate update 
rebase to master
 2023-06-27 13:59:57 +02:00
Raeschen
eac8c86ee8 Merge pull request #6459 from FluffMedic/Phazon 
Two New POis, one kind of expiremental
 2023-06-27 13:53:26 +02:00
Raeschen
0563e27be0 resync upstream maps for ease 
not used, doesn't matter
 2023-06-27 13:32:14 +02:00
SlaysInCode
aa97b0a482 Get out of Brig free card Removal 
A PR I should have putt through when disposal damage was first removed/nerfed.

- Removes the disposals bin in the Brig, replacing it with a basic large bin instead. Thus preventing mechanic abuse.
 2023-06-27 07:10:38 -04:00