cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,037 Commits 10 Branches 0 Tags
878b195dbb39d0a5bbbb7029b55caa96e8d47af1
Commit Graph

21232 Commits

Author SHA1 Message Date
Aronai Sieyes
878b195dbb Merge pull request #4030 from VOREStation/upstream-merge-5402 
[MIRROR] Language and Larynx Additions
 2018-07-21 14:43:47 -04:00
Arokha Sieyes
46f7b22838 Fix virgo implant stuff 2018-07-21 14:21:17 -04:00
Aronai Sieyes
4dd5372495 Merge pull request #4033 from VOREStation/upstream-merge-5410 
[MIRROR] Fixes for R-UST Engine
 2018-07-21 11:40:05 -04:00
Aronai Sieyes
f29cf429af Merge pull request #3998 from Little-119/dsi-visualtweaks 
Removes ears from DSI Vulpkanin head sprites, enables body color for DSI limbs
 2018-07-21 11:37:45 -04:00
Arokha Sieyes
adbb5b86a5 Fix merge conflicts 2018-07-21 11:34:54 -04:00
Aronai Sieyes
9ad8199474 Merge pull request #4018 from VOREStation/upstream-merge-5407 
[MIRROR] Fixes a bug with integrated circuit printers.
 2018-07-17 23:34:21 -04:00
Aronai Sieyes
64f20f82ba Merge pull request #4015 from VOREStation/upstream-merge-5406 
[MIRROR] Fixes invisible toy
 2018-07-17 23:34:02 -04:00
Aronai Sieyes
25ad449643 Merge pull request #3996 from VOREStation/upstream-merge-5394 
[MIRROR] Adds an option to enable/disable markings on synth parts.
 2018-07-17 23:33:50 -04:00
Spades
98352eb5bb Merge pull request #4048 from deathride58/dispvoreprefs 
Hides mechanical vore preferences for mimics
 2018-07-17 05:26:44 -04:00
deathride58
7d398dcb4e Hides voreprefs for mimics 2018-07-16 22:36:23 -04:00
deathride58
1069e561bc Adds a var that determines if voreprefs can be shown on examine 2018-07-16 22:28:27 -04:00
gozulio
d21cea3965 R-UST Fixes. (#5410) 
R-UST Consoles can now be Deconstructed.
R-UST Consoles will not be inaccessible if broken or unpowered.
R-UST Consoles now accurately feed back if they're unpowered or broken.
R-UST Fusion field can no longer be stared at to hard by the AI.
 2018-07-14 15:15:52 -04:00
Anewbe
edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04:00
Leshana
6e34abb47f Fixes Stairs in BYOND 512.1436 
BYOND no longer calls Uncross reliably on stairs, to fix this we switch
to using CheckExit and Bumped.  This solution is probably the right way to
do it anyway.
 2018-07-12 23:23:34 -04:00
Aronai Sieyes
7b8f0843a5 Merge pull request #3999 from VOREStation/upstream-merge-5401 
[MIRROR] Taj Sign Language works
 2018-07-12 18:09:54 -04:00
avabee
caa8de0541 Fixes a bug with integrated circuit printers. (#5407) 
* Fixes a bug with integrated circuit printers.

This fixes a bug where tools, implants, and presumably (though i have yet to test it) device assemblies cannot be printed from the integrated circuit printer.
This is a much more robust solution for the print-anything bug than the previous one, as it expands the cost to the w_class of objects in it as well as lets you print anything in the current category. (This may be an issue when two people use it at once, but I mean, just learn to take turns or something.)

* closing parenthesis

oops
 2018-07-12 16:17:04 -04:00
Aronai Sieyes
6b0c8361e9 Merge pull request #4012 from Cyantime/patch-2 
Spawns off an alert in character setup.
 2018-07-12 15:04:20 -04:00
Neerti
27acb14028 Merge pull request #5406 from Mewchild/MC-Toysuit 
Fixes invisible toy
 2018-07-12 14:17:28 -04:00
avabee
6af40c4cec Fixes a typo with kitsune udon. 
Goodbye, Friend Egg. You will be sorely missed.
 2018-07-12 01:30:08 -05:00
Cyantime
53bbf6a3ec Spawns off an alert in character setup. 2018-07-12 04:21:03 +00:00
Aronai Sieyes
1feb833d3f Merge pull request #3994 from Little-119/trash-birds 
Gives vox the trash eating verb
 2018-07-11 21:36:10 -04:00
Aronai Sieyes
e5e6af1370 Merge pull request #4010 from VOREStation/upstream-merge-5384 
[MIRROR] Saber fix.
 2018-07-11 21:36:00 -04:00
Aronai Sieyes
caeb019672 Merge pull request #4009 from VOREStation/upstream-merge-5403 
[MIRROR] Limbs can find the clothing that covers them
 2018-07-11 21:35:41 -04:00
Aronai Sieyes
241fe7a09a Merge pull request #4007 from Little-119/prototype-trait-fix 
Fixes the prototype trait showing up
 2018-07-11 21:34:49 -04:00
Aronai Sieyes
1d5af24b35 Merge pull request #4002 from VOREStation/upstream-merge-5398 
[MIRROR] Cutting cables will now transfer fingerprints.
 2018-07-11 21:34:23 -04:00
Aronai Sieyes
0097426d41 Merge pull request #4000 from Verkister/patch-22 
Fixes itemweak gurgles ignoring food reagents.
 2018-07-11 21:33:58 -04:00
Aronai Sieyes
f5ff6fec9a Merge branch 'master' into upstream-merge-5401 2018-07-11 21:31:18 -04:00
Aronai Sieyes
b547da5bfb Merge pull request #3997 from VOREStation/upstream-merge-5395 
[MIRROR] Adds four new tatoos
 2018-07-11 21:28:56 -04:00
Aronai Sieyes
c369025bfa Synth markings 2018-07-11 21:28:19 -04:00
Aronai Sieyes
5b2007a58e Merge pull request #3992 from VOREStation/upstream-merge-5392 
[MIRROR] Prevents dummy AIs from spawning with communicators or PDAs.
 2018-07-11 21:23:57 -04:00
Aronai Sieyes
799594b48f Merge pull request #3991 from VOREStation/upstream-merge-5393 
[MIRROR] Fixes a typo with cups of lime tea.
 2018-07-11 21:22:08 -04:00
Aronai Sieyes
4679dfe24e Merge pull request #3990 from VOREStation/upstream-merge-5391 
[MIRROR] Tweak i_beam qdel logic
 2018-07-11 21:21:19 -04:00
Kates
fd0bfab228 Saber fix. (#5384) 
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
 2018-07-11 00:49:32 -04:00
Atermonera
4526b0d095 Merge pull request #5403 from Anewbe/get_clothing_on_limb 
Limbs can find the clothing that covers them
 2018-07-11 00:38:59 -04:00
Little-119
0420b627f2 Stops the prototype trait from showing up 2018-07-09 21:48:34 -04:00
Neerti
5a221f37a4 Merge pull request #5398 from Mechoid/CablePrints 
Cutting cables will now transfer fingerprints.
 2018-07-09 11:39:31 -04:00
Verkister
d60242d2cb Fixes itemweak gurgles ignoring food reagents. 
-Fixes food/drinks/organs/etc. being utterly worthless when gurgled with itemfriendly mode.
 2018-07-09 13:30:32 +03:00
Neerti
aff66f9037 Taj Sign Language works 2018-07-09 02:00:19 -04:00
Little-119
8a3be37570 Enables skin_tone on DSI parts 2018-07-08 22:46:58 -04:00
Anewbe
c84447047c Merge pull request #5395 from elgeonmb/sabsthing 
Adds four new tatoos
 2018-07-08 17:37:55 -04:00
Anewbe
5fff00c4d5 Adds an option to enable/disable markings on synth parts. 2018-07-08 17:36:41 -04:00
Little-119
d68e908c9e Gives vox the trash eating verb 2018-07-07 22:46:27 -04:00
avabee
45cfd410b2 Prevents dummy AIs from spawning with communicators or PDAs. (#5392) 
* Adds an 'is_dummy' variable to AIs.

* Prevents dummy AIs from spawning with communicators or PDAs.
 2018-07-07 14:30:27 -04:00
Anewbe
bfe15d1558 Merge pull request #5393 from avabee/patch-1 
Fixes a typo with cups of lime tea.
 2018-07-07 14:30:16 -04:00
Anewbe
f1049dd1c1 Merge pull request #5391 from VOREStation/pol-infra 
Tweak i_beam qdel logic
 2018-07-06 19:34:44 -04:00
Arokha Sieyes
633bc2cc3d Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync07062018 
# Conflicts:
#	code/__defines/species_languages.dm
#	code/__defines/subsystems.dm
#	code/controllers/Processes/planet.dm
#	code/game/machinery/cloning.dm
#	code/game/machinery/recharger.dm
#	code/modules/mob/living/carbon/human/emote.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/paperwork/photography.dm
#	code/modules/projectiles/guns/energy/special.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-07-06 17:20:03 -04:00
Aronai Sieyes
a8b9fa86df Merge pull request #3966 from Verkister/killborg 
Fixes sleeperbellies not ejecting contents on borg death.
 2018-07-04 19:37:39 -04:00
Anewbe
af08909d49 Merge pull request #5389 from VOREStation/pol-hypo 
Fix hypospray exploit
 2018-07-04 11:50:55 -04:00
Anewbe
eb690c0f00 Merge pull request #5389 from VOREStation/pol-hypo 
Fix hypospray exploit
 2018-07-04 10:50:28 -05:00
Aronai Sieyes
05989b6aa9 Merge pull request #3971 from VOREStation/upstream-merge-5385 
[MIRROR] Fix handheld Cameras
 2018-07-03 18:52:58 -04:00