cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 05:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,766 Commits 7 Branches 0 Tags
3e21a525676de7a75cb2fd843ffd4b308ee67aa0
Commit Graph

33501 Commits

Author SHA1 Message Date
Casey
3e21a52567 New nice ticket(panel) 2022-10-10 02:57:42 +00:00
Verkister
fd9e8654ec fixes solarmoth space runtime spam 
Im not even going to talk about the line right above this part...
 2022-10-09 14:12:00 +03:00
Nadyr
8c907b1b5f Merge pull request #5081 from crabcube/master 
Tie new sprites to Vox suits
 2022-10-08 23:30:24 -04:00
Nadyr
b0b43ffde6 Merge pull request #5093 from Verkister/patch-99 
Lets non-crew show up in char directory
 2022-10-08 23:24:27 -04:00
Verkister
8ae208ce5e fine dm didn't mind that but go off 2022-10-08 18:40:09 +03:00
Verkister
49bc0134ae Lets non-crew show up in char directory 
Humanmobs without crew record will however show up as "unknown" in the directory. However, with this addition, any antag who wants to stay completely sneaky will need to toggle their directory visibility manually, which should probably be added to event guidelines.
 2022-10-08 14:41:47 +03:00
Verkister
3ef9f48a15 Lets capture crystal occupant see belly texts 
Capture crystal occupants can now see the belly desc printed in chat whenever the crystal enters a vorgan.
 2022-10-08 14:23:06 +03:00
Nadyr
46f2fa221e Merge pull request #5087 from Verkister/patch-94 
Earlyport harvest color fix
 2022-10-05 18:13:22 -04:00
Nadyr
ee8e5a3779 Merge pull request #5085 from TheGreatKitsune/vore-sprite-color 
Add vore sprite coloring.
 2022-10-05 18:11:05 -04:00
Verkister
0822ccfc55 Earlyport harvest color fix 
Fixes harvested produce getting the produce color (meant for the produce part of the icon overlay and not the leaf part, which uses its own color) applied on top of both already colored overlays for a second time, most visible on mushrooms, which have ended up with hypersaturated caps and incorrect underside colors.
 2022-10-05 14:05:53 +03:00
TheGreatKitsune
1d8bc1b862 Add vore sprite coloring. 2022-10-04 18:07:56 -05:00
C.L
70d12b326b bugtest your stuff lol 
shame bell
 2022-10-04 18:30:20 -04:00
crabcube
0beb9d1648 Tie new sprites to Vox suits 
Wip for now as i make sure it works
 2022-10-03 20:32:44 -05:00
Razgriz
bc11a71651 Merge pull request #5065 from CHOMPStation2/upstream-merge-13825 
[MIRROR] Sanitization
 2022-10-02 23:01:42 -07:00
Razgriz
d7a36a1961 Merge pull request #5074 from CHOMPStation2/Razgriz1032-patch-20 
Remove self-insert
 2022-10-02 22:48:17 -07:00
Razgriz
cd0e5fd00a Merge pull request #5068 from CHOMPStation2/upstream-merge-13828 
[MIRROR] Blueprint Revamp.
 2022-10-02 22:47:55 -07:00
Razgriz
e4123b28ba Update buildmode.dm 2022-10-02 22:28:38 -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
1f745f7af4 🧠 2022-10-02 22:12:03 -07:00
Razgriz
07e6fd2583 Merge pull request #5069 from CHOMPStation2/upstream-merge-13827 
[MIRROR] Mining bugfix
 2022-10-02 22:08:38 -07:00
Razgriz
6a40e6518d Merge branch 'master' into upstream-merge-13825 2022-10-02 22:00:46 -07:00
Razgriz
9a1ec7367b Merge pull request #5062 from CHOMPStation2/upstream-merge-13822 
[MIRROR] Ghost default swap
 2022-10-02 21:58:56 -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
Razgriz
a3a5552ed1 powder that makes you say yes 2022-10-02 20:54:50 -07:00
Razgriz
8769c3c131 Merge pull request #5060 from CHOMPStation2/upstream-merge-13819 
[MIRROR] Complicates Pakkuns
 2022-10-02 20:52:40 -07:00
Razgriz
010a74dead Merge pull request #5054 from purplefoxy27/mouse_shutdown 
Prevents simple_mobs from using emergency_shutdown, eject_usb and eject_id
 2022-10-02 20:52:22 -07:00
Razgriz
41b7170f1a Merge pull request #4933 from cookiemans/appliancefix 
Allows for deconstruction and RPED-less upgrading of kitchen appliances. FIXES #4172
 2022-10-02 20:52:09 -07:00
Razgriz
5144b94e57 Remove self-insert 
We don't do that here, not even with our own staff
 2022-10-02 19:27:48 -07:00
Razgriz
6a7e260775 Merge pull request #5066 from CHOMPStation2/upstream-merge-13824 
[MIRROR] stops absorbed chimeras going feral
 2022-10-02 19:16:18 -07:00
Razgriz
f9666046e2 Merge pull request #5064 from CHOMPStation2/upstream-merge-13820 
[MIRROR] Fixes build mode and makes it not terrible.
 2022-10-02 19:14:41 -07:00
Razgriz
d58dd4db3f powder that makes you say yes 2022-10-02 19:13:54 -07:00
Razgriz
dd29043380 Merge pull request #5061 from CHOMPStation2/upstream-merge-13817 
[MIRROR] Fixes belly spiral from being cut off.
 2022-10-02 19:11:10 -07:00
Razgriz
40ac24c6a9 Merge branch 'master' into upstream-merge-13819 2022-10-02 19:10:03 -07:00
Razgriz
2a5a27bbf6 Merge pull request #5057 from CHOMPStation2/upstream-merge-13808 
[MIRROR] fixes psilocybin
 2022-10-02 19:07:38 -07:00
Razgriz
c6a6bd636c Merge pull request #5056 from CHOMPStation2/upstream-merge-13834 
[MIRROR] Fixes critical crash bugs
 2022-10-02 19:07:07 -07:00
Razgriz
e72e468900 Merge pull request #5052 from CHOMPStation2/upstream-merge-13818 
[MIRROR] Enhances pakkuns
 2022-10-02 19:04:43 -07:00
Casey
416a52bbe9 Merge pull request #13827 from VOREStation/Mining-Bugfix 
Mining bugfix
 2022-10-02 17:59:53 +00: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
8019bc7bc5 Merge pull request #13824 from Screemonster/rumbliesinthetumblies 
stops absorbed chimeras going feral
 2022-10-02 17:58:38 +00:00
Casey
d8b03336e5 Sanitization 2022-10-02 17:58:34 +00:00
Casey
04e399ea92 Merge pull request #13820 from Cameron653/BUILD_MODE_PLEASE 
Fixes build mode and makes it not terrible.
 2022-10-02 17:57:27 +00:00
Casey
669d498598 Ghost default swap 2022-10-02 17:57:19 +00:00
Casey
aa358fbc53 Merge pull request #13817 from VOREStation/Cameron653-patch-1 
Fixes belly spiral from being cut off.
 2022-10-02 17:56:12 +00:00
Casey
5b6b16087a Complicates Pakkuns 2022-10-02 17:56:08 +00:00
Casey
b6e433e53f Merge pull request #13808 from Cameron653/drug_adjustment 
fixes psilocybin
 2022-10-02 17:52:47 +00:00
Novacat
c6228f74de Merge pull request #13834 from Heroman3003/big-crash-fixes 
Fixes critical crash bugs
 2022-10-02 03:35:36 +00:00
purplefoxy27
cb1e64d279 Prevents simple_mobs from force shutdown and eject_id - Fixes #4973 2022-09-29 22:01:28 -07:00
Razgriz
dbc2cba71c Merge pull request #5050 from Darlantanis/ChemistrySynthesizer 
Programmable Automated Chemical Synthesizer
 2022-09-29 18:58:57 -07:00
Casey
f25375fadf Merge pull request #13818 from Screemonster/snapsnapsnappi 
Enhances pakkuns
 2022-09-28 23:49:56 +00:00