cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,927 Commits 8 Branches 0 Tags
408eeaa5d18421b45e40cbbccd4c06d684fd5dce
Commit Graph

1095 Commits

Author SHA1 Message Date
Casey
b82736dc53 Merge pull request #14504 from Very-Soft/misc_fixes 
Misc fixes
 2023-02-17 19:32:51 +00:00
Razgriz
92d9cc3724 Add ticket printer to warden locker 2023-02-15 16:29:04 -07:00
Razgriz
492eb58400 Add ticket printer to HoS locker 2023-02-15 16:28:18 -07:00
Razgriz
fa3c94ace6 Add ticket printer to security locker 2023-02-15 16:27:09 -07:00
Razgriz
eb0909a6fb Update HoS lockers 2nd deck 2023-02-12 17:28:05 -07:00
BlackMajor
353f4e1cab Merge branch 'master' into upstream-merge-14247 2023-01-25 14:01:30 +13:00
Razgriz
376b3e8906 powder that makes you say yes 2023-01-24 17:53:21 -07:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Razgriz
418643dce3 unfucc exploration 
please do not the department
 2023-01-21 22:21:39 -07:00
Novacat
b1c7a73918 Merge pull request #14301 from Heroman3003/borgfix2 
Fixes personal lockers robbing borgs of their modules
 2023-01-04 13:40:35 +00:00
Casey
754c0af3c3 Gives pilots their holdout back 2022-12-26 02:11:48 +00:00
Casey
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
Heroman3003
4a38648ead Merge pull request #13974 from TheDavestDave/cargo-update 
lets cargo order a pair of great tits
 2022-10-29 07:38:10 +00:00
Casey
892960d661 Blueprint Revamp. 2022-10-02 17:59:49 +00:00
VirgoBot
bfbbf3d48e [MIRROR] Adds job winter coats to job lockers (ABLE TO BE MERGED) (#12904) 
* Adds job winter coats to job lockers

* Update hooded.dm

* Update wardrobe.dm

* Update security.dm

* Update scientist.dm

* Update medical.dm

* Update cargo.dm

* Update job_closets.dm

* Update job_closets.dm

* Update hooded.dm

Co-authored-by: Spookerton <spkrtn@pm.me>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:02:38 +00:00
Verkister
21417259ea Enables cargo otie crates 
Also adds a few more rng types for the said crates.
Unmarked earlyport for now i guess
 2022-09-06 16:30:44 +03:00
Casey
fa9dd3dc1b Adds double engi closets for SD and RP 2022-07-17 09:31:34 +00:00
Casey
7ac2d6537b Merge pull request #13249 from BonniePandora/petty-rage 
Changes the site manager's sidearm from a singular option to a choice instead
 2022-07-03 09:07:00 +00:00
Nadyr
46ff42c250 Merge pull request #4371 from CHOMPStation2/upstream-merge-13103 
[MIRROR] [MIRROR-FIX] Cooking QOL V2
 2022-06-22 21:55:19 -04:00
Novacat
47c92f2581 [MIRROR-FIX] Cooking QOL V2 2022-06-18 14:45:56 +00:00
Casey
c1187d1942 Various Fixes 2022-06-18 00:02:11 +00:00
Nadyr
96b9b449fc powder that makes you say yes 2022-05-27 15:54:25 -04:00
Casey
4aa0977f19 A couple more engineering QoL changes. 2022-05-22 18:24:54 +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
Tasald
9962272e51 Exploration upgread (#4137) 
* Add pathfinder to drop pouches

adds pathfinder to drop pouches so they can have them to.

* Revert "Add pathfinder to drop pouches"

* Revert "Revert "Add pathfinder to drop pouches""

* Exploration gear update

Adds missing standard items to exploration lockers so they arn't gimped.

* Update misc.dm

* PF locker update

Adds the plate carrier and exploration bags to pathfinder locker

* PF bags

Lets the pathfinder spawn with exploration bags instead of generic ones

* Binocs

Adds binocs to the list of items that can be stored in the belt

* Ecig addition

Adds the standard and alternative ecigs to the base load out. dun know if setting the price of the alt one two 2 is good or not.

* removes sharp things

takes out the duplicate knife and machete

* removes macete holster

* Update outfit_vr.dm

* Update misc.dm

* Update belt_vr.dm

* Update misc_vr.dm

* Update misc_vr.dm

* Update loadout_accessories.dm

* Update loadout_smoking.dm

* Update misc.dm
 2022-04-21 23:45:03 -07:00
Casey
0a447ad26f Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean 
Xenobio Upgrades
 2022-04-11 19:24:32 +00:00
Nadyr
a121954e24 Merge pull request #3992 from CHOMPStation2/upstream-merge-12592 
[MIRROR] The Grand /TG Port - Part 6
 2022-04-04 17:52:53 -04:00
Nadyr
6fe5e8c1e1 Merge pull request #3991 from CHOMPStation2/upstream-merge-12579 
[MIRROR] The Grand /TG Port - Part 5
 2022-04-04 17:37:57 -04:00
Casey
de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Casey
60b1eeff99 Merge pull request #12579 from GhostActual/tg-port-5 
The Grand /TG Port - Part 5
 2022-04-03 03:30:56 +00:00
Casey
3ea4c8b9ea Merge pull request #12577 from GhostActual/tg-port-3 
The Grand /TG Port - Part 3
 2022-04-03 03:28:43 +00:00
Razgriz
390bca0ec1 powder that makes you say yes 2022-03-27 00:18:25 -07:00
Casey
51bd77e5c2 Firearms 1 2022-03-26 03:56:42 +00:00
Nadyr
6cecc1762a powder that makes you say yes 2022-03-20 18:52:03 -04:00
Casey
8e0552a788 Colts, Revolvers, and Tasers 2022-03-20 03:10:23 +00:00
Casey
de6e5c4932 Merge pull request #12382 from BonniePandora/Atmosia-Improvements 
Minor Atmos-tech QoL & new hazard vest
 2022-03-07 08:36:25 +00:00
Nadyr
3fe87a33ed Merge pull request #3711 from CHOMPStation2/upstream-merge-12253 
[MIRROR] Donk Co. Toys
 2022-02-19 19:55:19 -05:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Casey
e723ed2118 Heavy-duty Engineer's Gloves 2022-02-14 21:32:19 +00:00
Nadyr
33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
Nadyr
03bae00061 Merge pull request #3616 from CHOMPStation2/upstream-merge-12151 
[MIRROR] adds a catslug crate to cargo
 2022-02-06 20:40:53 -05:00
Nadyr
4efce5f15f Merge pull request #3615 from CHOMPStation2/upstream-merge-12146 
[MIRROR] skimpy cap "dress" probably more like a leotard idk
 2022-02-06 20:36:30 -05:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Casey
b77383ecce Merge pull request #12151 from PastelPrinceDan/catslugcrate 
adds a catslug crate to cargo
 2022-02-06 14:16:18 +00:00
Casey
86ca5e5d49 Merge pull request #12146 from Hatterhat/formal-in-the-loosest-sense 
skimpy cap "dress" probably more like a leotard idk
 2022-02-06 14:15:06 +00:00
Casey
7f3da20187 Talon Improvements, Take 2 2022-02-06 14:07:23 +00:00
Casey
5cefa8d4e3 department berets (mostly heads tbh) 2021-12-12 04:20:38 -05:00
Casey
3d3fc07d0e Merge pull request #11877 from Heroman3003/glovening 
Adds leather gloves to (xeno)botanist lockers
 2021-12-10 06:12:10 +00:00
Chompstation Bot
60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Aronai Sieyes
f2702c5455 Merge pull request #11544 from VOREStation/upstream-merge-8230 
[MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
 2021-10-22 18:24:49 +00:00