cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 17:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,533 Commits 8 Branches 0 Tags
042366372ec009959cfcd53ad94f8f6df95843d8
Commit Graph

10383 Commits

Author SHA1 Message Date
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
Nadyr
f301254079 powder that makes you say yes 2022-09-18 20:51:46 -04:00
Nadyr
89d3735adf Merge pull request #4951 from CHOMPStation2/upstream-merge-13742 
[MIRROR] Fixes a few more runtimes.
 2022-09-18 20:41:50 -04:00
Casey
6b01537fa3 Fixes runtime with cryopods 2022-09-18 09:39:31 +00:00
Casey
f2716e95ae Adds more altevian content 2022-09-18 09:39:22 +00:00
Casey
08c0ad1753 Merge pull request #13742 from Heroman3003/moreruntimes 
Fixes a few more runtimes.
 2022-09-18 09:35:35 +00:00
Casey
bfca16b709 Merge pull request #13728 from Novacat/nova-basicfixes 
Snowglobes
 2022-09-18 09:34:24 +00:00
Desert
0c59519570 Merge branch 'CHOMPStation2:master' into circuit-updates 2022-09-10 21:03:20 -05:00
Nadyr
7c702b4b90 Merge pull request #4892 from CHOMPStation2/upstream-merge-13683 
[MIRROR] Fixes bug regarding feral xenochimera and treating others/being treated
 2022-09-10 21:52:24 -04:00
Desert
f35a813c70 Allows user to interact with inputs on mounted devices 2022-09-10 20:39:23 -05:00
Casey
b1152c170e Merge pull request #13683 from TheGreatKitsune/dexterity-fix 
Fixes bug regarding feral xenochimera and treating others/being treated
 2022-09-10 20:37:05 +00:00
Casey
81a9b7000e Merge pull request #13687 from Very-Soft/tunnelsnakes 
Tunnel Snakes Rule
 2022-09-10 20:36:55 +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
Nadyr
7276d043c7 Merge pull request #4863 from CHOMPStation2/upstream-merge-13671 
[MIRROR] More light updates!
 2022-09-07 16:10:31 -04:00
Nadyr
87ccda6a4a Merge pull request #4861 from CHOMPStation2/upstream-merge-13669 
[MIRROR] Fixes a few more runtimes
 2022-09-07 16:06:55 -04:00
Casey
ceca2956e1 Merge pull request #13671 from Cameron653/light_overlay 
More light updates!
 2022-09-06 19:44:48 +00:00
Casey
f874f1de0c Merge pull request #13669 from Heroman3003/runtimes2 
Fixes a few more runtimes
 2022-09-06 19:42:35 +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
Nadyr
84345c2931 Merge pull request #4844 from CHOMPStation2/upstream-merge-13658 
[MIRROR] fixes runtime with stack dna transfer
 2022-09-04 18:21:14 -04:00
Casey
8a0aef53f8 Merge pull request #13658 from Heroman3003/stackruntime 
fixes runtime with stack dna transfer
 2022-09-04 21:50:22 +00:00