cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-09 16:09:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,903 Commits 9 Branches 0 Tags
fcc2f9aa79d45901f556448b83cd2fc67f2b1366
Commit Graph

9670 Commits

Author SHA1 Message Date
Repede
932caf2b37 Merge branch 'self' of https://github.com/Yawn-Wider/YWPolarisVore into self 2018-08-17 19:14:28 -04:00
Repede
ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
 2018-08-17 19:13:15 -04:00
Spades
e6f2a72d92 Merge pull request #4075 from VOREStation/upstream-merge-5433 
[MIRROR] Limits fire_stacks on mobs by temperature
 2018-08-17 16:11:40 -04:00
Spades
6a95420bf9 Merge pull request #4064 from VOREStation/upstream-merge-5426 
[MIRROR] Fixes a few bugs associated with the Dead Ringer
 2018-08-17 16:07:16 -04:00
Spades
7ace233760 Merge pull request #4105 from ArgobargSoup/master 
Cosmetic tweaks for catgirls.
 2018-08-17 16:06:22 -04:00
Spades
7bec3f26aa Merge pull request #4152 from VOREStation/upstream-merge-5487 
[MIRROR] PENGUINS ARE FROM EARTH
 2018-08-17 16:06:02 -04:00
Spades
db804f02ee Merge pull request #4061 from VOREStation/upstream-merge-5423 
[MIRROR] Implements ways to make floors not get dirty
 2018-08-16 05:44:19 -04:00
Spades
84a3d824de Merge pull request #3885 from Cameron653/ALRAUNE_STUFF 
Alraune abilities and minor code changes
 2018-08-13 07:50:23 -04:00
Spades
ed06781743 Merge pull request #3759 from Verkister/belletweakins 
Dogborg equipment/belly tweaks and fixes. (Ready)
 2018-08-13 07:49:55 -04:00
Anewbe
1d44e34e85 Merge pull request #5487 from elgeonmb/patch-8 
PENGUINS ARE FROM EARTH
 2018-08-09 15:55:00 -04:00
Nadyr
28974eaf2d Fixed a grammatical error in shadekin hold flavor text. 2018-08-01 20:05:48 -05:00
Sharkmare
229887eb55 Proteans now able to use Teshari DSI prosthetics 2018-08-01 23:52:02 +02:00
ArgobargSoup
403ee2eba5 Cosmetic tweaks for catgirls. 2018-07-29 14:08:11 -07:00
Anewbe
002d3a2bd2 Merge pull request #5433 from Atermonera/fire_limit 
Limits fire_stacks on mobs by temperature
 2018-07-24 11:01:58 -04:00
Cameron653
5fc76df183 Merge branch 'master' into ALRAUNE_STUFF 2018-07-23 20:08:30 -04:00
Repede
5d5bdf9c69 Removes alraune whitelist 2018-07-22 00:43:03 -04:00
Atermonera
c07d42e75a Merge pull request #5426 from Anewbe/deadringer_fixes 
Fixes a few bugs associated with the Dead Ringer
 2018-07-22 00:26:47 -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
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
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
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
adbb5b86a5 Fix merge conflicts 2018-07-21 11:34:54 -04:00
Atermonera
0a83f95c92 Merge pull request #5423 from Anewbe/dirt_floors 
Implements ways to make floors not get dirty
 2018-07-20 21:48:11 -04:00
Mewchild
cba1776588 Removes Rootspeak from Alraune 2018-07-19 10:28:01 -05:00
Hawk_v3
e6f05b03eb Comments out Tajr 
Because it's Alai now or something yet the file didn't change?
 2018-07-18 12:46:24 +01: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
Repede
1b5cb2bafa Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 2018-07-17 20:30:33 -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
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
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
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
Anewbe
edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -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
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
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
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
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
aff66f9037 Taj Sign Language works 2018-07-09 02:00:19 -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
Repede
223aa0b68f Removes gutter whitelist 2018-07-08 11:49:42 -04:00
Repede
123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm
 2018-07-08 11:38:06 -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