cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-14 03:14:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,375 Commits 8 Branches 0 Tags
de491df7b781ff4e8a26aabc753cf21796da21a6
Commit Graph

10355 Commits

Author SHA1 Message Date
Casey
de491df7b7 Radiation Rework 2022-09-23 00:56:28 +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
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
Casey
514d5def1e Merge pull request #13655 from Heroman3003/ghostcomm 
Fixes ghost comms runtime probably
 2022-09-04 21:49:12 +00:00
Nadyr
0543038500 Merge pull request #4814 from CHOMPStation2/upstream-merge-13612 
[MIRROR] Pizza vouchers now fit inside wallets
 2022-09-04 16:53:24 -04:00
Casey
21554ed113 Merge pull request #13627 from Very-Soft/micro_structures 
Makes it so you need to be inside to leave
 2022-09-02 05:14:10 +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
2123838942 Merge pull request #4809 from CHOMPStation2/upstream-merge-13608 
[MIRROR] /objs with mobs in them spit out the mobs before they Destroy()
 2022-08-31 01:14:24 -04:00
Nadyr
f83b6c2ad8 Merge branch 'master' into upstream-merge-13606 2022-08-30 19:01:55 -04:00
Casey
50e4e471ee Merge pull request #13608 from Very-Soft/micro_structures 
/objs with mobs in them spit out the mobs before they Destroy()
 2022-08-30 10:52:02 +00:00
Casey
4d7e22c2e1 Adjustments to Mouse holse, micro hiding, and smole buildings! WOW! 2022-08-30 09:07:18 +00:00
Nadyr
a278ddbb6d Merge branch 'master' into upstream-merge-13605 2022-08-30 00:03:11 -04:00
Casey
fad28d0138 Micro hiding! 2022-08-30 03:47:11 +00:00
Casey
1905520600 Mouse hole! 2022-08-29 05:36:25 +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
a734024908 Merge pull request #4771 from Verkister/patch-87 
Fixes ancient oversight in recursive explosions
 2022-08-28 19:10:02 -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
Verkister
320dc916b8 Also fixes a more recent one 2022-08-25 15:53:51 +03:00
Verkister
50facbf850 Fixes ancient oversight in recursive explosions 
earlyport from the future where i've pr'd this upstreams (too sleepy in present)
 2022-08-24 23:16:49 +03:00
Casey
da9722545b More casino updates 2022-08-21 19:38:41 +00:00
Casey
eb3f1875b2 Merge pull request #13534 from Cameron653/NEED_A_MEDIC_BAG 
Makes the freezer able to hold more items at cost of size.
 2022-08-21 19:37:35 +00:00
Razgriz
efc83a4860 Re-add slavic language (#4729) 
* Re-add slavic language

Don'tn't.

* Slavic

* Slavic

* Slavic

* Slavic
 2022-08-17 22:50:13 -07:00
Nadyr
c7fc0804c8 Merge pull request #4699 from CHOMPStation2/upstream-merge-13485 
[MIRROR] Condenses all the animal languages and deletes unused/unwanted languages
 2022-08-17 17:35:28 -04:00
Nadyr
4209a92290 Merge pull request #4703 from CHOMPStation2/upstream-merge-13494 
[MIRROR] Fixes secure briefcase AltClick
 2022-08-14 17:44:49 -04:00
Nadyr
dc1701ae71 Merge pull request #4692 from CHOMPStation2/upstream-merge-13476 
[MIRROR] LEMME SUCC
 2022-08-14 17:30:44 -04:00
Casey
4a0fa06764 Merge pull request #13494 from ItsSelis/secure-briefcase-fix 
Fixes secure briefcase AltClick
 2022-08-14 19:12:29 +00:00