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
44,070 Commits 5 Branches 0 Tags
02e5b2eef0851629875ad8463e3cc0ff3a30e428
Commit Graph

32644 Commits

Author SHA1 Message Date
Neerti
02e5b2eef0 Merge pull request #5430 from Anewbe/onmob_gun_fixes 
Fixes a few on-mob gun sprites
 2018-07-23 01:52:31 -04:00
Aronai Sieyes
115bfa2dc3 Merge pull request #4057 from Mewchild/MC-Alraune 
Removes Rootspeak from Alraune
 2018-07-21 15:52:38 -04:00
Aronai Sieyes
e95bfba4ed Merge pull request #4055 from VOREStation/upstream-merge-5416 
[MIRROR] Hopefully fixes seeing and hearing AOOC bug
 2018-07-21 15:52:10 -04:00
Aronai Sieyes
78112a432c Merge pull request #4052 from VOREStation/upstream-merge-5417 
[MIRROR] Gender name adjustments
 2018-07-21 15:52:01 -04:00
Aronai Sieyes
d83c8ff0ed Merge pull request #4047 from VOREStation/upstream-merge-5396 
[MIRROR] Adds new AI core sprites
 2018-07-21 15:51:23 -04:00
Aronai Sieyes
c0d9e8d512 Merge pull request #4042 from VOREStation/upstream-merge-5411 
[MIRROR] Hides syndi-synths from the manifest
 2018-07-21 14:46:12 -04:00
Aronai Sieyes
939642a564 Merge pull request #4037 from VOREStation/upstream-merge-5386 
[MIRROR] Add a procedure for repairing limbs via surgery.
 2018-07-21 14:45:35 -04:00
Aronai Sieyes
1e2d27e8c4 Merge pull request #4035 from VOREStation/upstream-merge-5409 
[MIRROR] Adds roofing tiles
 2018-07-21 14:44:09 -04:00
Aronai Sieyes
1369c45f13 Merge pull request #4034 from VOREStation/upstream-merge-5317 
[MIRROR] Dead Ringer + PoI
 2018-07-21 14:43:59 -04:00
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
Mewchild
cba1776588 Removes Rootspeak from Alraune 2018-07-19 10:28:01 -05:00
Neerti
ea04f9dae9 Merge pull request #5416 from Anewbe/aooc_fix 
Hopefully fixes seeing and hearing AOOC bug
 2018-07-18 15:11:41 -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
8589e2cd7d Merge pull request #4016 from VOREStation/upstream-merge-5404 
[MIRROR] Water tiles clear underlays in update_icon
 2018-07-17 23:34:12 -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
Anewbe
f327f32255 Merge pull request #5417 from kartagrafi/patch-1 
Gender name adjustments
 2018-07-17 22:15:06 -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
Jonathon Key
bbaaaa1c20 Adds new AI core sprites (#5396) 
* Adds new AI core sprites

* Added an overlooked sprite, gentoo

* Fixes define issue with Triumvirate

* Changes names of 2 sprites

* Changelogs are strange
 2018-07-16 18:19:10 -04:00
Atermonera
5ce99af730 Hides syndi-synths from the manifest (#5411) 
* Manifest doesn't show the same stationbound cyborgs and AIs that the upload consoles don't show

* Manifest doesn't show borgs with scrambedcodes set
 2018-07-15 13:27:47 -04:00
Anewbe
e2da5d687b Merge pull request #5386 from Mechoid/End_The_Tyranny_Of_Chemistry 
Add a procedure for repairing limbs via surgery.
 2018-07-14 15:57:52 -04:00
Atermonera
1216f97663 Adds roofing tiles (#5409) 
* Adds roofing tiles
They're used to place plating overhead without going up a floor
And to remove weather effects

Changing a turf will correctly inherit the old outdoors variable, so that roofing tiles can check it when deciding whether to roof an area

* Adds roofing tiles
They're used to place plating overhead without going up a floor
And to remove weather effects

Changing a turf will correctly inherit the old outdoors variable, so that roofing tiles can check it when deciding whether to roof an area
 2018-07-14 15:24:33 -04:00
drexample
090ba940a8 Dead Ringer + PoI (#5317) 
* fixed photos

* Revert "fixed photos"

What was I thinking?

* Added stopwatch, deadringer, cultist mob and PoIs for them.
Made simplemobs ignore invisible people.

* Organ deletion fix.

* Test

* projectile fix + time adjustment

* initialize crate change

* Changed cultists into semi-transparent ghost people

* Removed Stopwatch for a separate PR

* Removed stopwatch trace

* removed cultists from dme

* Removed Stopwatch PoI

* Clean up unused files / stopwatch addition

* Replaced sounds with stock ones from
freesound.org
Removed icon modifications
Grammar fix
Removed unused sound files

* PoI tweaked

* Removed unused area
 2018-07-14 15:16:04 -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
Anewbe
296cda6d7a Merge pull request #5404 from Atermonera/water_tile_underlays 
Water tiles clear underlays in update_icon
 2018-07-12 14:38:23 -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
365be23874 Merge pull request #4008 from VOREStation/upstream-merge-5397 
[MIRROR] Global list boilerplates cause the target path to actually add to the list
 2018-07-11 21:35:13 -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