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

6422 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
c3374cff9f powder that makes you say yes 2022-09-25 17:19:38 -04:00
Casey
1550c3bee5 Mining adjustments 2022-09-25 20:47:34 +00: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
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
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
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
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
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
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
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
8e50c6cfd9 Merge pull request #4960 from CHOMPStation2/upstream-merge-13750 
[MIRROR] Adds more altevian content
 2022-09-18 21:13:27 -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
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
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
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
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
Casey
514d5def1e Merge pull request #13655 from Heroman3003/ghostcomm 
Fixes ghost comms runtime probably
 2022-09-04 21:49:12 +00:00
Casey
4c46939600 Merge pull request #13612 from Verkister/patch-118 
Pizza vouchers now fit inside wallets
 2022-08-31 07:35:06 +00:00
Nadyr
44a8097881 Merge pull request #4785 from CHOMPStation2/upstream-merge-13576 
[MIRROR] Makes flashlights not runtime.
 2022-08-28 20:42:17 -04:00
Nadyr
5cdfba0298 Merge pull request #4784 from CHOMPStation2/upstream-merge-13578 
[MIRROR] Makes the inducer not break forever when trying to charge a gun
 2022-08-28 19:26:42 -04:00
Nadyr
d46d8dc33c Merge pull request #4782 from CHOMPStation2/upstream-merge-13570 
[MIRROR] Adds Altevian cuisine
 2022-08-28 19:26:06 -04:00
Nadyr
323a57e271 Merge pull request #4747 from CHOMPStation2/upstream-merge-13536 
[MIRROR] More casino updates
 2022-08-28 18:51:48 -04:00
Casey
d99af385b6 Merge pull request #13576 from Cameron653/flashlight_runtimefix 
Makes flashlights not runtime.
 2022-08-25 23:01:29 +00:00
Casey
2e989c1bc3 Merge pull request #13578 from Cameron653/inducer_fix 
Makes the inducer not break forever when trying to charge a gun
 2022-08-25 23:01:25 +00:00
Casey
85cf31f79c Merge pull request #13570 from Heroman3003/altevian-foods 
Adds Altevian cuisine
 2022-08-25 23:00:13 +00:00