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

23664 Commits

Author SHA1 Message Date
Novacat
d7e919c66f Merge pull request #6482 from VOREStation/upstream-merge-6636 
[MIRROR] Fix various syntactic problems
 2020-01-21 01:23:04 -05:00
Novacat
59ef7b48cf Update retail_scanner.dm 2020-01-21 01:12:12 -05:00
Novacat
213545ed98 Update cash_register.dm 2020-01-21 01:11:42 -05:00
Novacat
c14f3340ff Update light.dm 2020-01-21 01:11:19 -05:00
Novacat
110d37a4e5 Update misc_special.dm 2020-01-21 01:11:02 -05:00
Novacat
aeee2fd56d Update admin_secrets.dm 2020-01-21 01:10:34 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Atermonera
5954adfe46 Merge pull request #6622 from Mechoid/WaterResistanceExists 
Water resistance exists
 2020-01-20 22:51:52 -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
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
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
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
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
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
Heroman
6a21fccabd Fixes the fix for drone pod announcement 2020-01-16 13:47:52 +10: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
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
Verkister
2b9f48c74f Adds sound alert for paranoia logging 
criminal detected
 2020-01-14 22:52:23 +02: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
Heroman
aa53bdc0ed Fixes drone droppod not being announced 2020-01-13 16:51:12 +10:00
Novacat
c1a52de67b Merge pull request #6438 from Heroman3003/dronefix 
Makes drone age restriction based on config setting too
 2020-01-13 01:37:11 -05:00
Heroman
4551f97924 Makes drone age restriction based on config setting too 2020-01-13 14:56:27 +10:00
Novacat
105f13e03c Merge pull request #6424 from drexample/gnot-sure 
You've been gnomed.
 2020-01-12 22:02:41 -05:00
Atermonera
b262b4ac96 Merge pull request #6623 from Heroman3003/radfix 
Fixes calculation of wall rad resistance
 2020-01-12 18:18:17 -05:00
Novacat
0a58fb115c Merge pull request #6433 from Heroman3003/dronelimit 
Adds a timegate on playing maintenance drones
 2020-01-12 17:03:43 -05:00
Heroman
de03c4e3e3 Adds a timegate on playing maintenance drones 2020-01-13 06:19:10 +10:00
Verkister
8cc8f73ccc Fixes mob riding double input exploit 
The rider's movement input is now ignored if the mount has moved within the last second.
 2020-01-12 02:09:56 +02:00
Novacat
af973e5bde Merge pull request #6428 from lbnesquik/Taur-clothes-fix 
Poncho is now in the loadout as well, with a little pointer to notify people it can do taur stuff
 2020-01-11 11:35:00 -05:00
Kates
930215e3d7 Update loadout_suit_vr.dm 2020-01-11 17:07:29 +01:00
Verkister
bcced2f53b Fixes sleeperbellies not supplying air to occupant 
Fixes sleeperbellies forcing the occupant to breathe external atmosphere and killing the occupant in hostile external environments.
 2020-01-11 17:13:10 +02:00