cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,512 Commits 9 Branches 0 Tags
05bf6c7125917c9a17178df615a2adc03552dbd6
Commit Graph

31476 Commits

Author SHA1 Message Date
Repede
05bf6c7125 Noobie mistake fix 2018-03-08 17:46:07 -05:00
Repede
97593604d6 Oops, forgot proc rename 2018-03-08 08:17:45 -05:00
Repede
04eaa84e9b Changing players discord bot command to 'status' which gives playercount and round duration. 2018-03-07 20:28:34 -05:00
Repede
46577b7321 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/mecha/combat/gorilla.dm
#	code/modules/vore/eating/bellymodes_vr.dm
 2018-03-06 18:11:39 -05:00
Aronai Sieyes
de44e7e01e Merge pull request #3185 from Verkister/voreday 
A whole bunch of vore related fixes.
 2018-03-06 13:08:43 -05:00
Leshana
3a94638dbf Merge pull request #3156 from Verkister/wideborgs 
Small wide/dog borg tweaks/fixes
 2018-03-06 09:43:32 -05:00
Verkister
ea911b0024 Squashed commit of the following: 
commit 8ac3c5dedb16e64fc44ae598f2cfb718f7b15865
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue Mar 6 12:45:18 2018 +0200

    Disables ejection on empty bellies while at it

    Found it kinda bothersome during some tests where any mob getting killed, digested, or deleted would do a loud and nasty ejection for each forementioned action despite being empty.

commit 4efc1fb84e1057b31a9c8c37cefc7f74941d5e1c
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue Mar 6 12:36:59 2018 +0200

    Update bellymodes_vr.dm

commit 2668e41def96e3d25ead01991b013f9b2c4ce7b2
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Mar 5 18:31:09 2018 +0200

    pref protection

commit ce8d48d907605f3c46eaf9d8b532b0d002516d0c
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Mar 5 14:41:28 2018 +0200

    whoops
 2018-03-06 13:03:34 +02:00
Repede
cd30b47429 fixed horn to be on ear slot instead 2018-03-05 21:07:51 -05:00
Leshana
61415c24bd Merge pull request #3183 from VOREStation/vplk-ss-holomaps 
Reorganzied Holo Minimaps into SSholomaps subsystem.
 2018-03-05 20:13:32 -05:00
Aronai Sieyes
43aa168f71 Merge pull request #3174 from VOREStation/aro-syringes 
Make syringes not require 3 clicks to inject
 2018-03-05 18:41:53 -05:00
Aronai Sieyes
10a9793fdb Merge pull request #3177 from aztectornado/syringe-case 
Adds quickdraw objects and syringe cases
 2018-03-05 18:36:27 -05:00
Aronai Sieyes
c1c1a398c6 Merge pull request #3181 from VOREStation/Cameron653-patch-1 
Fixes a fluff item
 2018-03-05 18:36:08 -05:00
Aronai Sieyes
33f4048e41 Merge pull request #3180 from Konabird/RischiEgg 
Fixes Rischi's egg implant to actually work
 2018-03-05 18:35:34 -05:00
Aronai Sieyes
efd96ea7c2 Merge pull request #3178 from VOREStation/aro-sync 
Polaris Sync
 2018-03-05 18:26:24 -05:00
Repede
9ea2479616 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-03-05 08:58:54 -05:00
Verkister
6e816a3517 A whole bunch of vore related fixes. 
-Fixes prey not hearing gurgles from inside the gut.
-Prey now gets it privately in full glory.
-Tweaked the miniscule vore sound falloff that made things barely audible at all. People not in the immediately adjacent tiles may hear some faint noises if they listen intently enough, but that feels like a less of a problem compared to the stuff being barely hearable on ground zero tile.
-Fixes hunger noises.
-Hunger noises now scale gradually from 0 to 100% vol in the span of 250 to 0 nutrition.
-Fixes attack anims messing up pixel offsets on our big voremobs and dogborgs.
-Removes prey size multiplier from mob vore "fullness" that would prevent 1-seater mobs from touching any even slightly taller than average chars. They already have a max size blocker in the will_eat thing.
-Makes bellies hide prey deathmessages again.
-Fixes security oties not changing to hold mode for human arrests.(I swear I had fixed this thing before???)
 2018-03-05 14:38:55 +02:00
Leshana
56bb1c46ec Reorganzied Holo Minimaps into SSholomaps subsystem. 
Running its init as part of proper init sequence lets us time it properly.
Plus its nicer than the hacky override of the old master controller.
 2018-03-04 21:54:20 -05:00
Aztectornado
2d0872b524 Adds quickdraw objects and syringe cases 2018-03-04 18:58:34 -06:00
Cameron653
a3d380d09d Fixes a fluff item 2018-03-04 17:25:49 -05:00
Repede
a72f7344bb Added single horn marking 2018-03-04 16:21:02 -05:00
Leshana
40d155a20a Keep nurse hat spiders. 2018-03-04 16:03:53 -05:00
Konabird
a5b1befc6d Fixes Rischi's egg implant to actually work 2018-03-04 14:37:20 -06:00
Arokha Sieyes
8edfdca9ac Remove design_vr for ear translator as it's a stock polaris one now 2018-03-04 13:59:08 -05:00
Arokha Sieyes
fa95ae3d42 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2018-03-04 13:32:53 -05:00
Aronai Sieyes
6ce25e9166 Merge pull request #3172 from VOREStation/aro-bellytweak 
Make sure not to add extra vore organs
 2018-03-04 13:28:30 -05:00
Atermonera
18c0bc5b27 Merge pull request #5000 from Belsima/slime-fix 
Slime brains now actually have container settings!
 2018-03-04 10:02:51 -08:00
Atermonera
947c076d04 Merge pull request #4996 from Verkister/patch-6 
Fixes drone borgs spawning with dropped IDs
 2018-03-04 10:02:34 -08:00
Atermonera
3a85517d30 Merge pull request #5001 from Nerezza/Snowfloorfix 
Fixes #4993
 2018-03-04 10:02:14 -08:00
Aronai Sieyes
9517a30d4e Merge pull request #3167 from LiquidFirefly/patch-1 
Fixes a single letter.
 2018-03-04 12:41:53 -05:00
Aronai Sieyes
96d085cb42 Merge pull request #3154 from Heroman3003/language-upgr-fix 
Fixed Language upgrade not being removed after being applied
 2018-03-04 12:40:52 -05:00
Arokha Sieyes
8e055e9c18 VS: Move this line for syringe time change 2018-03-04 12:21:41 -05:00
Arokha Sieyes
5ece4638a9 POLARIS: Syringes inject with one click rather than three 2018-03-04 12:21:40 -05:00
Arokha Sieyes
f5b400f6e0 Make sure not to add extra vore organs 2018-03-04 12:16:10 -05:00
Repede
f41b0b2390 Fookin fidget spinners 
And kitsune tail
 2018-03-04 00:03:44 -05:00
Nerezza
715bed5d58 Fixes Switch Shoe Layer to re-layer shoes in real time (#4998) 2018-03-03 17:44:59 -08:00
Atermonera
7a49fae955 Merge pull request #4997 from Cyantime/patch-1 
Fixes typo in alien pod loot pile
 2018-03-03 17:44:18 -08:00
Screemonster
13e83b00d1 Makes drills report faults over supply channel (#4989) 
* Makes drills report faults over supply channel

* too chatte

* caps and punctuation are important
 2018-03-03 18:47:07 -06:00
Repede
e3b03832f1 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	vorestation.dme
 2018-03-03 15:14:27 -05:00
Arokha Sieyes
68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
 2018-03-03 13:09:57 -05:00
Nerezza
b9b79af6c2 Fixes #4993 
Snow overlays no longer block interractions with the floor beneath them.
 2018-03-03 11:26:15 -06:00
Belsima
3c6e7a95b9 orgam 2018-03-03 11:43:50 -05:00
Heroman3003
9d001c25aa Fixed supply manifests having wrong amount of packages in shipment (#4994) 2018-03-02 18:25:28 -08:00
BillyBangles
6ff1f1b165 fixes #4992 (#4995) 
i'm good at this i swear
 2018-03-02 18:24:51 -08:00
Belsima
c2be6a7575 More standardized grammar (#4977) 2018-03-02 18:24:15 -08:00
Arokha Sieyes
f37e75011b Revert "Reverse floor decal removal commit 00f8ae5" 
This reverts commit 517d4a9e56.
 2018-03-02 20:04:08 -05:00
Cyantime
4bc4ccc91c Alien pod typo 2018-03-03 00:11:30 +00:00
Verkister
d077784729 Fixes drone borgs spawning with dropped IDs 
Someone had moved the thing back to the outcommented older code part without updating the old code there.
 2018-03-02 11:20:14 +02:00
Arokha Sieyes
8a8c4d76d2 Convert bellies to save using JSON 2018-03-02 02:22:20 -05:00
Anewbe
0722293830 Manual revert of https://github.com/PolarisSS13/Polaris/pull/4839 (#4908) 2018-03-01 21:27:04 -08:00
Repede
c749c27e1a Merge branch 'master' of https://github.com/VOREStation/VOREStation 2018-03-01 21:49:58 -05:00