cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,628 Commits 5 Branches 0 Tags
18963d37143344017b51d9c514d267bbd24b7d59
Commit Graph

35895 Commits

Author SHA1 Message Date
Novacat
18963d3714 Update Sleeper.dm 2020-01-21 01:15:30 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Heroman
27127a11e0 Fixes bots being able to do vore 2020-01-20 11:08:04 +10:00
TheFurryFeline
5b179a8035 Sec Cart Key Fixy 
Title. Fixes a downstream issue. This fixes  https://github.com/Yawn-Wider/YWPolarisVore/issues/465

Changelog Notes:

- Fixes broken key usage that, once taken out of the Security Cart, you can't put it back inside the vehicle.
 2020-01-19 13:05:44 -05:00
TheFurryFeline
1f99be6906 Light Frame Infinite Steel Fixy (#6633) 
* Light Frame Infinite Steel Fixy

Title.

Changelog Notes: 

- Fixes light frames returning 5 steel per deconstruction when 2 steel is used to create the frame.

* Changelog
 2020-01-19 00:51:24 -05:00
Shadow-Quill
4bd6a61c94 Alert Revert (#6631) 2020-01-17 03:50:13 -05:00
Aronai Sieyes
2b4064e5cf IP reputation check toggle verb 2020-01-16 10:11:44 -05:00
Novacat
76ff478822 Merge pull request #6467 from VOREStation/upstream-merge-6624 
[MIRROR] Changeling Item Name/Desc Fixy
 2020-01-16 08:59:33 -05:00
TheFurryFeline
dc0c513086 Changeling Item Name/Desc Fixy (#6624) 
* Changeling Name/Desc Fixy

Minor var fixes for the changeling combat boots variation. Apparently name and desc were flipped around, resulting in abnormal name output when removed from a dead Beta Replicant.

* Changelog
 2020-01-16 02:56:14 -05:00
Verkister
fa0a6d88a8 Fixes loadout index runtime spam (#6626) 
sanity checks saving the day once more.
 2020-01-16 02:56:04 -05:00
Novacat
f99069e9ca Merge pull request #6465 from VOREStation/upstream-merge-6620 
[MIRROR] Pauses event processing while doing event actions
 2020-01-15 23:52:48 -05:00
Atermonera
4fb26a6429 Merge pull request #6620 from Heroman3003/eventpause 
Pauses event processing while doing event actions
 2020-01-15 23:43:46 -05:00
Atermonera
c9ca929b5c Merge pull request #6617 from Shadow-Quill/Paper-Pen-Confirmation 
Adds holding pen check + alert
 2020-01-15 23:42:32 -05:00
Novacat
708e0b477e Merge pull request #6463 from VOREStation/upstream-merge-6619 
[MIRROR] Can now (de)construct chem masters
 2020-01-15 23:35:39 -05:00
Novacat
fc9da97eec Merge pull request #6456 from Heroman3003/podfix2 
Fixes the fix for drone pod announcement
 2020-01-15 23:27:40 -05:00
Novacat
50e38ffaee Merge pull request #6453 from Rykka-Stormheart/shep-dev-micro-mech-fix 
Micro Mech Slot Fix
 2020-01-15 23:27:29 -05:00
Novacat
af99818f08 Merge pull request #6462 from VOREStation/upstream-merge-6615 
[MIRROR] Fixes ion proj not EMPing when hitting walls
 2020-01-15 23:25:31 -05:00
Novacat
c6794d5e47 Merge pull request #6461 from VOREStation/upstream-merge-6616 
[MIRROR] Sign Language translator now properly works
 2020-01-15 23:25:18 -05:00
Novacat
5c8c5fae29 Merge pull request #6460 from VOREStation/upstream-merge-6618 
[MIRROR] Event manager logs now show correct station time
 2020-01-15 23:24:51 -05:00
Novacat
e7b72c36e2 Merge pull request #6459 from VOREStation/upstream-merge-6614 
[MIRROR] Psychiatrists can now properly get the medical turtleneck via loadout
 2020-01-15 23:24:27 -05:00
Atermonera
7ae5204eaf Merge pull request #6619 from Shadow-Quill/Chem-Master-Building 
Can now (de)construct chem masters
 2020-01-15 23:16:19 -05:00
Atermonera
aaf71ecbbf Merge pull request #6615 from Shadow-Quill/Ion-Fix 
Fixes ion proj not EMPing when hitting walls
 2020-01-15 23:10:55 -05:00
Atermonera
e4528a99bf Merge pull request #6616 from Shadow-Quill/Sign-Lang-Translator-Fix 
Sign Language translator now properly works
 2020-01-15 23:10:43 -05:00
Atermonera
cdca4f68de Merge pull request #6618 from Shadow-Quill/Event-Manager-Time-Fix 
Event manager logs now show correct station time
 2020-01-15 23:10:32 -05:00
Atermonera
28a1d8669c Merge pull request #6614 from Shadow-Quill/Psyche-Turtleneck 
Psychiatrists can now properly get the medical turtleneck via loadout
 2020-01-15 23:09:19 -05:00
Atermonera
c50ef77161 Merge pull request #6612 from Shadow-Quill/PDA-Ctrl-Click 
Ctrl+Click now removes pens from PDAs
 2020-01-15 23:08:06 -05:00
Heroman
6a21fccabd Fixes the fix for drone pod announcement 2020-01-16 13:47:52 +10:00
Rykka
64e0ba695f Micro Mech Slot Fix 
This shows micro mech slots in the equipment area and allows for them to be properly disconnected.

Credit goes to InsanityKitten for finding and making this fix.
https://github.com/CHOMPStation2/CHOMPStation2/pull/158
 2020-01-15 17:21:58 -07:00
Novacat
a5b768eccc Merge pull request #6444 from Heroman3003/harpoonening 
Changes harpoons push mode to teleport user and not everything else
 2020-01-15 17:50:04 -05:00
Novacat
e8d40f86f3 Merge pull request #6451 from VOREStation/iprep 
IP reputation checking
 2020-01-15 17:49:44 -05:00
Novacat
aba090c12d Merge pull request #6443 from Heroman3003/slotjumble 
Adjusts job slots slightly
 2020-01-15 17:49:30 -05:00
Aronai Sieyes
9f7d58f246 Remove stray N (don't port this, it's in a VS edit) 2020-01-15 14:52:15 -05:00
Aronai Sieyes
e67419d8cc IP reputation checking 2020-01-15 14:30:41 -05:00
Spades
7169e2869c Merge pull request #6449 from Heroman3003/redundancy 
Removes some redundant vorestation edits
 2020-01-15 06:53:15 -05:00
Heroman
89c873db06 Removes some redundant vorestation edits 2020-01-15 18:30:43 +10:00
Novacat
f81bcd8c14 Merge pull request #6445 from Novacat/nova-basicfixes 
Removes gnomes from trash piles
 2020-01-15 00:10:47 -05:00
Novacat
ceca3f07c2 Merge pull request #6448 from VOREStation/Verkister-patch-6 
Adds sound alert for paranoia logging
 2020-01-14 18:40:22 -05:00
Verkister
2b9f48c74f Adds sound alert for paranoia logging 
criminal detected
 2020-01-14 22:52:23 +02:00
Heroman
181331d166 Earlyports fix for barista missing access 2020-01-15 04:48:41 +10:00
Unknown
d3aa3bed3c Removes gnomes 
https://cdn.discordapp.com/attachments/173832207784214528/666485419747180554/7f1b99fdd795299aabd6ddef202ecf98.png

This is why we cannot have nice things.
 2020-01-13 22:49:15 -05:00
Heroman
a2fd602b79 Adds extra roboticist slot 2020-01-14 11:33:14 +10:00
Heroman
c933abf19e Adjusts job slots slightly 2020-01-14 11:19:52 +10:00
Heroman
43065cb062 Changes harpoons push mode to teleport user and not everything else (pull mode unchanged) 2020-01-14 11:12:10 +10:00
Novacat
9a6271b42a Merge pull request #6442 from Heroman3003/grubfix 
Fixes grub event end announcement not functioning
 2020-01-13 16:55:55 -05:00
Heroman
ede140ec9c Fixes grub event end announcement not functioning 2020-01-14 05:58:38 +10:00
Novacat
d7962d0448 Merge pull request #6441 from Heroman3003/droppodfix 
Fixes droppod spawning wrong subtype
 2020-01-13 09:10:04 -05:00
Heroman3003
9e31d82dd5 Decreases chance 2020-01-13 18:16:46 +10:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Heroman
737d37321b Fixes droppod spawning wrong subtype 2020-01-13 17:48:33 +10:00
Novacat
fcd8fd1370 Merge pull request #6440 from Heroman3003/droppodfix 
Fixes drone droppod not being announced
 2020-01-13 02:04:30 -05:00