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,565 Commits 5 Branches 0 Tags
fec8571d65030704b4f72c2912e1f3cec8537fd6
Commit Graph

23636 Commits

Author SHA1 Message Date
Aronai Sieyes
fec8571d65 Ban/unban, note/unnote, kick to webhook 2020-01-15 21:26:56 -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
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
lbnesquik
a92437ce23 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Taur-clothes-fix 2020-01-11 07:49:03 +01:00
lbnesquik
af97208347 Poncho is now in the loadout as well, with a little pointer to notify people. 
Poncho is also compatible with drake taur,  wolf get janitaurial jumpsuit for the future.
 2020-01-11 07:48:36 +01:00
Novacat
24da40a882 Merge pull request #6426 from Heroman3003/dronedroppod 
Adds new random event: drone drop pod
 2020-01-11 01:19:16 -05:00
Novacat
e1f3b56f74 Revert "Temporarily removes update_client_z from /logout" 2020-01-11 01:08:14 -05:00
Heroman
47086d7bf0 Adds new event: drone drop pod 2020-01-11 16:02:12 +10:00
drexample
5e01ad45a5 coding standards are my passion 2020-01-11 06:59:33 +03:00
drexample
1be4fe8b3c hooh 2020-01-11 06:42:54 +03:00
Heroman
a570cafa2a Adds taur cloak and dress to loadout 2020-01-11 11:33:58 +10:00
Heroman
ed3e4230a2 Temporarily removes update_client_z from /logout 2020-01-11 08:04:41 +10:00
Atermonera
d5775d03be Merge pull request #6610 from Schnayy/glitterfly_borg 
Adds Pyralis borg sprite
 2020-01-10 01:11:20 -05:00
Novacat
022c7edaae Merge pull request #6405 from Mithrandalf/mouse3 
more mouse stuff, bugfix
 2020-01-09 22:51:47 -05:00
Novacat
4f6a7972d6 Merge pull request #6404 from Ketrai/iwantdie 
adds food cubes.
 2020-01-09 22:51:32 -05:00
Novacat
744758091b Merge pull request #6388 from Holdelta/BorgPetting 
Adding borg petting
 2020-01-09 22:51:19 -05:00
Novacat
658c0560c8 Merge pull request #6380 from Heroman3003/vore_laws 
Adds some vorish silicon lawsets
 2020-01-09 22:50:58 -05:00
Novacat
afb879ae23 Merge pull request #6379 from Heroman3003/resleeving_sickness 
Adds resleeving sickness
 2020-01-09 22:50:42 -05:00
Novacat
9b2ff8f8f7 Merge pull request #6312 from TheFurryFeline/TFF-No_Absorbee,_No_Absorbee,_Noooo_Absorbee 
Absorption Permission Stuff
 2020-01-09 22:50:18 -05:00
Heroman3003
5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Heroman
a9c1f48a93 Adds a single cure pill to vault, doubles amount ERT gets, changes taste 2020-01-10 09:31:51 +10:00
Heroman
0c5ddf8cbb Stat adjustments 2020-01-09 09:07:11 +10:00
Heroman
c693bf558d Does virgo-side of xenoflora expansion 2020-01-09 08:30:42 +10:00
Novacat
09e10e2901 Merge pull request #6406 from VOREStation/upstream-merge-6592 
[MIRROR] Xenoflora expansion take2
 2020-01-08 17:18:49 -05:00
Novacat
827a798d76 Merge pull request #6409 from VOREStation/upstream-merge-6596 
[MIRROR] Informs ghosts when someone dies
 2020-01-08 17:10:16 -05:00
Atermonera
cb99a0dd4a Merge pull request #6596 from GeneriedJenelle/patch-2 
Informs ghosts when someone dies
 2020-01-08 13:49:06 -05:00
Ketrai
85667c2a9b adds gnomes. (#6595) 
* adds gnomes

* Makes the house nice and bright.

* copypasta error

* Odd

* makes gnomes adminspawn only.

Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com>
 2020-01-08 13:47:41 -05:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Ketrai
28eb142141 Adds a recipe for food cubes 2020-01-08 19:45:49 +01:00
Mithrandalf
79557cba8f flicked the 1 to a 0 for machine_understands 2020-01-08 17:02:15 +00:00
Mithrandalf
1e8a54b736 mouse 2020-01-08 15:32:07 +00:00