cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 17:19:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,432 Commits 13 Branches 0 Tags
d4bb48b2f69198b26dc06bb064d5ffecfd45eb9a
Commit Graph
9600 Commits
Author SHA1 Message Date
Repede d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-29 09:58:53 -04:00
Verkister 82dd96a141 Adds a bunch of new sprite accessories. 
-Mainly ports from old Citadel assets.
-Markings: Otter face, Otter nose, Deer face, Cloven hooves, Shepherd snout, Shepherd back.
-Head accessories: Small bear ears, Deer ears, Small antlers, Deer ears with small antlers, Caprine horns, Drake frills.
-Also fixed a Polaris blooper from our tajaran sprite file. (The legs were facing in different directions in side views.)
 2018-06-29 15:32:30 +03:00
Hawk_v3 dfbd5336f1 Fix for Medhound 
Crowbar Duplication and Extinguisher Duplication
 2018-06-26 21:19:57 +01:00
Verkister d1ab58b7f8 Little tweaks etc. 
-Renamed heckboy paths.
-Fixed a sprite inconsistency.
-New latin names.
-Feral red changed to cult faction.
-Changed red tame chance to 20%.
-Made "experimental environment" otie crate have a 20% chance to contain a friendly red instead of phoron.
 2018-06-25 11:33:19 +03:00
Repede 1fabb5266d Adds mole option for mining borgs 2018-06-24 18:02:36 -04:00
Verkister 49e7cb1bcd Adds "redspace" oties. 
-Stats-wise identical to phoron mutants for now.
-Can appear in dangerous pred crate.
-Commissioned for shenanigans etc.
 2018-06-24 16:34:24 +03:00
Aronai SieyesandGitHub 859b06497b Merge pull request #3874 from Novacat/nova-pathfinder 
Ports Siik'Tajr from Baystation
 2018-06-24 01:02:52 -04:00
Aronai SieyesandGitHub 47dac5ae08 Merge pull request #3895 from Verkister/chompybois 
Gives simplemobs and dogborgs brutal predation
 2018-06-24 00:59:55 -04:00
Repede 8ea0e21fc6 Merge branch 'master' of https://github.com/Repede/YawnWiderStation into self 
# Conflicts:
#	icons/mob/robots.dmi
 2018-06-23 17:58:41 -04:00
Repede 2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-23 17:53:13 -04:00
MechoidandVirgoBot 382ce457ca Fix AI-drone runtimes. Get angry at commits. (#5366) 
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.

* Fix some AI-drone runtimes.
 2018-06-21 03:19:27 -04:00
izac112 8977654aaa Bovtender Sprites by Harpsong 
Signed-off-by: izac112 <izac10@live.com>
 2018-06-21 03:37:30 +02:00
Verkister 472672a834 reset module thing 2018-06-18 18:17:58 +03:00
AtermoneraandVirgoBot 0f171aa97a Merge pull request #5360 from Anewbe/aura_modifier 
Adds aura style modifier code
 2018-06-17 15:59:01 -04:00
Verkister de50347dfd Gives simplemobs and dogborgs brutal predation 
All these chompy bois around but only humans and pAIs are allowed to bite smh.
 2018-06-17 15:00:07 +03:00
Aronai SieyesandGitHub c06339487a Merge branch 'master' into upstream-merge-5335 2018-06-16 17:43:55 -04:00
Aronai SieyesandGitHub abd67bb983 Merge pull request #3889 from VOREStation/upstream-merge-5282 
[MIRROR] Allows AIs to produce and control maint/construction/mining drones.
 2018-06-16 10:51:20 -04:00
Aronai SieyesandGitHub dd504699e0 Merge pull request #3875 from Little-119/MSTA 
Makes synths able to taste again
 2018-06-16 10:47:37 -04:00
MechoidandVirgoBot 9b00166de0 Allows AIs to produce and control maint/construction/mining drones. (#5282) 
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
 2018-06-15 20:15:03 -04:00
Verkister ac94d82ba1 Couple VS edit fixes. 
-Fixes borg sleepers nuking passengers on cryo despawn.
-Fixes mimics dropping their guts.
 2018-06-15 10:24:39 +03:00
SpadesandGitHub 6f30b149cd Merge pull request #3351 from Screemonster/greenfingers 
alraune species
 2018-06-13 18:33:07 -04:00
Little-119 fa2da1ead6 Makes synths able to taste again 
Comments out the code added by commit 04ea07fb02

Since Aronai said he made synths able to taste a year ago, and synths not being able to taste was a goof
 2018-06-13 16:30:49 -04:00
Unknown c691ad5b8d Ports Siik'Tajr from Baystation 
Tail Sign language!
 2018-06-13 02:13:31 -04:00
AtermoneraandVirgoBot 7cd1442e8f Ports some Bay hair code 2018-06-12 03:43:57 -04:00
Repede 858b1414a8 fix xenochimera whitelist 2018-06-10 23:14:57 -04:00
Repede f772d7622c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-06-10 21:19:07 -04:00
Repede 9422dec67d Dabs on the proteans, hopefully. 2018-06-10 19:04:48 -04:00
deathride58 d78a1ef8ed And here, too! the /human subtype completely overrides the /atom/movable examine() 2018-06-09 07:05:53 -04:00
Repede 8cc1047023 Lots of new markings and stuff 2018-06-08 21:24:32 -04:00
Repede 90ce7b203a compile fix 2018-06-06 20:29:26 -04:00
Repede c0ea30d5ba Readded fatty taurs, 
Added Harpsongs new centtaur sprite
 2018-06-06 19:52:48 -04:00
Aronai SieyesandGitHub 632300ceeb Merge pull request #3831 from VOREStation/upstream-merge-5327 
[MIRROR] Changes "Setup Character" to "Character Setup"
 2018-06-04 17:27:47 -04:00
AnewbeandVirgoBot d755dfd2b8 Merge pull request #5327 from Cameron653/patch-2 
Changes "Setup Character" to "Character Setup"
 2018-06-04 16:08:13 -04:00
Repede b47d74979a new janidoggo sprite - Harpsong 2018-06-03 16:30:24 -04:00
AtermoneraandVirgoBot 76c8e20e2a Merge pull request #5301 from Anewbe/more_merc_mob_things 
Adds armor to certain mobs, mercs have knives
 2018-06-03 03:58:47 -04:00
Aronai SieyesandGitHub b0f21a938b Merge pull request #3822 from VOREStation/upstream-merge-5305 
[MIRROR] Prevent autosay() from creating/deleting AIs
 2018-06-02 19:03:02 -04:00
Repede b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.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
#	code/modules/power/lighting.dm
 2018-06-02 18:33:44 -04:00
Repede 3f7dd29745 Seromi can be older 2018-06-02 18:26:28 -04:00
AnewbeandVirgoBot 7528ac54fb Merge pull request #5305 from VOREStation/pol-autosay 
Prevent autosay() from creating/deleting AIs
 2018-06-02 12:47:27 -04:00
pontifexminimus2andGitHub 3ea860ae99 Typo 
Oops, that doesn't belong there...
 2018-06-02 18:32:42 +02:00
pontifex2 2f3fa81425 Assorted Zorren changes to make them in line with the lore I set up. 
Changed their blood colour to a blue.
Replaced their native language Siik (?? This is the Tajaran language) with Terminus, a Polaris language currently whitelisted.
Disabled the whitelist for Terminus.
Changed the description for Terminus so it's actually the Zorren's language.
 2018-06-02 18:28:44 +02:00
Aronai SieyesandGitHub e04212d616 Merge pull request #3763 from Ketrai/master 
Adds Fennix mob
 2018-06-01 10:49:02 -04:00
AnewbeandVirgoBot 25a6fb865a Merge pull request #5313 from VOREStation/pol-joblogmove 
Move character join log statement
 2018-05-31 21:33:31 -04:00
Aronai SieyesandGitHub 1c46d7e501 Merge pull request #3750 from fludd12/splat 
Prometheans melt on death.
 2018-05-31 13:11:02 -04:00
Aronai SieyesandGitHub d96f4de071 Merge pull request #3775 from Novacat/nova-heterochromia 
Adds Heterochromia Marking
 2018-05-31 13:08:12 -04:00
Aronai SieyesandGitHub f0f03c1d6d Merge pull request #3788 from VOREStation/aro-issue-3787 
Makes dogborgs spawn with bellies again
 2018-05-30 02:59:09 -04:00
Arokha Sieyes 309a28911a Makes dogborgs spawn with bellies again 
Fixes #3787
 2018-05-28 21:02:58 -04:00
Arokha Sieyes 8fdb1d3191 Rat code cleanup 
Fixes a compile warning and some other things (reduces view range, and how often they scan to be more like Ian)
 2018-05-28 17:35:50 -04:00
VerkisterandGitHub 1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Arokha Sieyes 2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
 2018-05-27 19:26:12 -04:00