cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,480 Commits 7 Branches 0 Tags
5bd9ad5ea30eaf6b80e7b81485149d6ac0366cb9
Commit Graph

20204 Commits

Author SHA1 Message Date
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
4beb1a88d0 Merge pull request #4995 from CHOMPStation2/upstream-merge-13775 
[MIRROR] Lighting Underlay Stacking Fix
 2022-09-22 21:14:41 -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
feba38ecef powder that makes you say yes 1 year later 2022-09-22 20:50:42 -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
a09214745b powder that makes you say yes 2022-09-22 20:36:38 -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
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
95b2307b61 Lighting Underlay Stacking Fix 2022-09-23 00:57:56 +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
cf8ada40c1 Merge pull request #4938 from CHOMPStation2/upstream-merge-13738 
[MIRROR] Fixes some adminverb runtimes
 2022-09-18 21:14:10 -04: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
baaa142998 Merge pull request #4955 from CHOMPStation2/upstream-merge-13744 
[MIRROR] Add charger penalty to biofuel processors
 2022-09-18 21:12:03 -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
6677ba69d3 Add charger penalty to biofuel processors 2022-09-18 09:36:54 +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
Novacat
9e7de62450 Fixes some adminverb runtimes 2022-09-15 13:52:33 +00:00
Nadyr
04b97a536f Merge pull request #4909 from CHOMPStation2/upstream-merge-13702 
[MIRROR] Fixes the VR pods to keep your character sprites perfectly copied.
 2022-09-10 22:08:28 -04:00
Nadyr
67cbcec070 Merge pull request #4904 from CHOMPStation2/upstream-merge-13705 
[MIRROR] Gives HoP entertainment backstage access
 2022-09-10 22:04:26 -04:00
Desert
0c59519570 Merge branch 'CHOMPStation2:master' into circuit-updates 2022-09-10 21:03:20 -05:00
Nadyr
e5e658ae48 Merge pull request #4897 from CHOMPStation2/upstream-merge-13690 
[MIRROR] Fixes moving out of sleepers while KO'd.
 2022-09-10 21:57:55 -04: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
Nadyr
df6049c37a Merge pull request #4890 from CHOMPStation2/upstream-merge-13687 
[MIRROR] Tunnel Snakes Rule
 2022-09-10 21:50:55 -04:00
Desert
f35a813c70 Allows user to interact with inputs on mounted devices 2022-09-10 20:39:23 -05:00
Casey
cb54de58b9 Merge pull request #13702 from tacoguy7765093/VR-Fix-Super-Jank 
Fixes the VR pods to keep your character sprites perfectly copied.
 2022-09-10 21:06:14 +00:00
Casey
5e147b2aee Merge pull request #13705 from Runa-Dacino/HoP_entertainment 
Gives HoP entertainment backstage access
 2022-09-10 20:47:17 +00:00
Casey
327fbe859c Merge pull request #13690 from VOREStation/Cameron653-patch-1 
Fixes moving out of sleepers while KO'd.
 2022-09-10 20:38:32 +00: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
Casey
2fbd18b67c Merge pull request #13681 from Heroman3003/few-things-aaa 
Fixes a few minor things
 2022-09-10 20:35:43 +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