cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-13 19:03:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,721 Commits 9 Branches 0 Tags
cd0e5fd00a470398cc2edc92e2328581dca457fe
Commit Graph

10403 Commits

Author SHA1 Message Date
Razgriz
cd0e5fd00a Merge pull request #5068 from CHOMPStation2/upstream-merge-13828 
[MIRROR] Blueprint Revamp.
 2022-10-02 22:47:55 -07:00
Razgriz
d0185f2ce3 Merge pull request #5067 from CHOMPStation2/upstream-merge-13823 
[MIRROR] Adds in 'compliance implant'
 2022-10-02 22:24:18 -07:00
Razgriz
6c1509c0ad powder that makes you say yes 2022-10-02 22:03:08 -07:00
Razgriz
2b204b9194 Port old point defense stuff I rage-closed 
Tech-debt repo-man called
https://github.com/CHOMPStation2/CHOMPStation2/pull/1790
 2022-10-02 21:39:21 -07:00
Casey
892960d661 Blueprint Revamp. 2022-10-02 17:59:49 +00:00
Casey
f6708d3687 Adds in 'compliance implant' 2022-10-02 17:58:42 +00:00
Casey
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
Nadyr
16cdb0dd2f Merge pull request #5046 from CHOMPStation2/upstream-merge-13804 
[MIRROR] ADMIN: EVENT
 2022-09-25 17:50:54 -04:00
Nadyr
c3374cff9f powder that makes you say yes 2022-09-25 17:19:38 -04:00
C.L
dacb52516e Merge pull request #13804 from Heroman3003/empty-message-fix 
ADMIN: EVENT
 2022-09-25 20:48:53 +00:00
Casey
1550c3bee5 Mining adjustments 2022-09-25 20:47:34 +00:00
Razgriz
4aa886eb1a Merge pull request #5035 from CHOMPStation2/upstream-merge-13793 
[MIRROR] Adds the rest of the phazon parts (circuits) to contraband packages.
 2022-09-25 13:21:28 -07:00
Casey
69598ec7e8 Merge pull request #13793 from VOREStation/Cameron653-patch-1 
Adds the rest of the phazon parts (circuits) to contraband packages.
 2022-09-24 00:23:53 +00:00
Casey
0353c14324 TOOL! 2022-09-24 00:23:48 +00:00
Razgriz
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
Razgriz
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
Razgriz
5c9dc4c7b5 Update signs.dm 2022-09-22 22:42:55 -07:00
Razgriz
e0139a383f Merge branch 'master' into master 2022-09-22 22:40:13 -07:00
Razgriz
042366372e Merge pull request #5018 from CHOMPStation2/I-Will-Give-You-500-Dollars-to-fuck-off-conflicts 
[Manual MIRROR] Adds a ton more altevian stuff
 2022-09-22 22:24:16 -07:00
Razgriz
ddb814a248 Merge pull request #5011 from CHOMPStation2/upstream-merge-12899 
[MIRROR] [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED)
 2022-09-22 22:17:56 -07:00
Razgriz
f7d606d3db Merge pull request #5009 from CHOMPStation2/upstream-merge-13621 
[MIRROR] [MIRROR] Airlock assembly naming window starts with base_name (ABLE TO BE MERGED)
 2022-09-22 22:11:23 -07:00
Razgriz
fa6ecc5cee Merge pull request #5004 from CHOMPStation2/upstream-merge-13467 
[MIRROR] [MIRROR] conk rete (ABLE TO BE MERGED)
 2022-09-22 22:10:59 -07:00
Razgriz
0a3deac50c powder that makes you give birth to an angry yes demon 2022-09-22 22:01:53 -07:00
Razgriz
e60b51327c Merge pull request #5015 from CHOMPStation2/upstream-merge-13010 
[MIRROR] [MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED)
 2022-09-22 21:59:18 -07:00
Razgriz
2bb42df36d powder that makes you say yes 2022-09-22 21:55:10 -07:00
Razgriz
b93ed83208 powder that makes you say yes 2022-09-22 21:43:21 -07:00
Razgriz
dcb0e1f3bf Merge pull request #5001 from CHOMPStation2/upstream-merge-13784 
[MIRROR] Fixes bluespace bag recursion disappearance
 2022-09-22 21:34:34 -07:00
Razgriz
6bbcda4901 [Manual MIRROR] Adds a ton more altevian stuff 
Ports https://github.com/VOREStation/VOREStation/pull/13774 instead of the auto mirror because github was crying over conflicts with a .dmi file
 2022-09-22 21:32:28 -07:00
Razgriz
91fd231d78 Merge pull request #4989 from CHOMPStation2/upstream-merge-13769 
[MIRROR] Radiation Rework
 2022-09-22 21:14:38 -07:00
Razgriz
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
Razgriz
c1c5d60d82 Merge pull request #5002 from CHOMPStation2/upstream-merge-12904 
[MIRROR] [MIRROR] Adds job winter coats to job lockers (ABLE TO BE MERGED)
 2022-09-22 21:01:19 -07:00
Razgriz
fe47515136 Merge branch 'master' into upstream-merge-13784 2022-09-22 20:59:44 -07:00
Razgriz
c58fb6369b Merge pull request #4990 from CHOMPStation2/upstream-merge-13768 
[MIRROR] Fixes runtime with sheet snatcher
 2022-09-22 20:49:03 -07:00
Razgriz
dff419e979 powder that makes you say yes 2022-09-22 20:48:02 -07:00
Razgriz
5eef621ffc Merge pull request #4987 from CHOMPStation2/upstream-merge-13771 
[MIRROR] Removes hotfood vendors from station spawning
 2022-09-22 20:45:47 -07:00
Razgriz
b3c887e8cc Merge pull request #4981 from CHOMPStation2/upstream-merge-13767 
[MIRROR] Fixes a few bugs/runtimes
 2022-09-22 20:38:17 -07:00
Razgriz
acf63f3b62 Merge pull request #4962 from CHOMPStation2/upstream-merge-13748 
[MIRROR] Fixes runtime with cryopods
 2022-09-22 20:31:57 -07:00
VirgoBot
a3c824dcc8 [MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED) (#13010) 
* Fixes directional overlays on padded comfy and rounded chairs

* Fixes mirror conflicts (#13411)

* Update chairs.dm

* Update chairs.dm

Co-authored-by: Cerebulon <tanhindmarsh@yahoo.com>
Co-authored-by: Poojawa <Poojawa@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:08:46 +00:00
VirgoBot
4acf5e2e67 [MIRROR] conk rete (ABLE TO BE MERGED) 2022-09-23 01:03: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
Casey
e78a07640f Fixes bluespace bag recursion disappearance 2022-09-23 01:00:28 +00:00
Casey
327e492548 Merge pull request #13768 from Heroman3003/runtimefix 
Fixes runtime with sheet snatcher
 2022-09-23 00:56:32 +00:00
Casey
de491df7b7 Radiation Rework 2022-09-23 00:56:28 +00:00
Casey
efef3da1af Merge pull request #13771 from Heroman3003/hotfood-nerf 
Removes hotfood vendors from station spawning
 2022-09-23 00:56:17 +00:00
Casey
870ef78b24 Merge pull request #13767 from Heroman3003/lang-autosay 
Fixes a few bugs/runtimes
 2022-09-23 00:54:48 +00:00
Casey
524cd2e671 Adds personal shield generators. [READY FOR MERGE] 2022-09-23 00:53:41 +00:00
Nadyr
8247ddd9a7 Merge pull request #4915 from xnqm8h/circuit-updates 
Allows interaction with mounted circuit assemblies, FIXES #4647
 2022-09-19 00:27:51 -04:00
Desert
cc3bfa36c4 Update items.dm 
Added chompstation comments.
 2022-09-18 22:53:07 -05:00
Nadyr
8e50c6cfd9 Merge pull request #4960 from CHOMPStation2/upstream-merge-13750 
[MIRROR] Adds more altevian content
 2022-09-18 21:13:27 -04:00