cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,318 Commits 7 Branches 0 Tags
961f2934c431017a98d18b2d731298d2c39c13f0
Commit Graph

31345 Commits

Author SHA1 Message Date
Aronai Sieyes
961f2934c4 Merge pull request #3242 from VOREStation/aro-commfactor 
Communicator + NIF Refactor
 2018-03-16 20:34:21 -04:00
Aronai Sieyes
1e87a06292 Merge pull request #3255 from VOREStation/aro-robocheck 
Fix incorrect robolimb checks
 2018-03-16 20:34:10 -04:00
Leshana
b02773a71e Merge pull request #3216 from Screemonster/hatchnow 
Makes the monstertamer/clonexadone reaction force hatching too
 2018-03-16 20:11:18 -04:00
Leshana
6eb46a05e6 Merge pull request #3250 from VOREStation/aro-shapeshiftplus 
Add eye color to shapeshifters
 2018-03-16 20:09:37 -04:00
Aronai Sieyes
9361164046 Merge pull request #3235 from Cameron653/VULP_ALT_TAIL 
Adds an alt vulp tail style.
 2018-03-16 19:54:50 -04:00
Aronai Sieyes
29ae148dcf Merge pull request #3244 from VOREStation/aro-infectheal 
Prevent infections from healing you, small tweaks
 2018-03-16 19:54:38 -04:00
Aronai Sieyes
6bb551c49a Merge pull request #3247 from VOREStation/aro-promfix 
Fix several organ bugs + Prometheans
 2018-03-16 19:54:28 -04:00
Arokha Sieyes
26d5e7e0b6 POLARIS: Add eye color to shapeshifters 2018-03-16 19:53:26 -04:00
Arokha Sieyes
0c2c029537 POLARIS: Fix incorrect robolimb checks 2018-03-16 19:51:46 -04:00
Leshana
7a94f18b26 Merge pull request #3248 from VOREStation/aro-rarity 
UI Tweak involving species rarity
 2018-03-16 19:41:59 -04:00
Aronai Sieyes
5f1162b815 Merge pull request #3246 from VOREStation/aro-stat 
Allow species-specific statpanels
 2018-03-16 19:39:49 -04:00
Leshana
371a7a6195 Merge pull request #3243 from VOREStation/aro-ventcrawl 
Ventcrawl Anim + VS Fix
 2018-03-16 19:16:19 -04:00
Arokha Sieyes
34c0a69918 POLARIS: Fix several organ bugs 
Eye color without needing eyes, Prometheans not dropping limbs, robotize not always honoring your parameters
 2018-03-16 19:10:01 -04:00
Leshana
718f89e848 Merge pull request #3249 from VOREStation/aro-tooltipfix 
Fix tooltip style sanitize
 2018-03-16 19:04:58 -04:00
Leshana
d3c350a4db Merge branch 'master' into polaris-sync-2018-03-15 2018-03-16 14:23:12 -04:00
Leshana
67044e6643 Merge pull request #3245 from Screemonster/panderp 
Moves panda eye markings to _vr files
 2018-03-16 14:16:17 -04:00
Leshana
2a72489efd Merge pull request #3226 from VOREStation/aro-reducedouble 
Reduce double admin logs
 2018-03-16 01:14:27 -04:00
Leshana
5831a8705a Fixup wings and custom vorestation tails to the new update_icons() system. 
Adjust taur suits.  Keep some job alt titles.
 2018-03-16 00:46:10 -04:00
Arokha Sieyes
f1965f997c POLARIS: Fix simple animal tooltip 2018-03-16 00:12:41 -04:00
Arokha Sieyes
821ee11272 POLARIS: Fix tooltip style sanitize 2018-03-16 00:11:38 -04:00
Arokha Sieyes
c69b3b5d04 POLARIS: UI Tweak involving species rarity 2018-03-16 00:10:43 -04:00
Arokha Sieyes
6d2d0eadfa POLARIS: Allow species-specific statpanels 2018-03-15 23:56:43 -04:00
Screemonster
513c99a5db Moves panda eye markings to _vr files 2018-03-16 03:54:56 +00:00
Arokha Sieyes
c43da73796 POLARIS: Prevent infections from healing you, small tweaks 2018-03-15 23:53:55 -04:00
Arokha Sieyes
399bcfa900 VS: Allow ventcrawling with bellies 2018-03-15 23:50:29 -04:00
Arokha Sieyes
bb4d4634f9 POLARIS: Adds an animation thing, uses it on ventcrawls 2018-03-15 23:50:14 -04:00
Arokha Sieyes
3909b285d1 VS: NIF small refactor 2018-03-15 23:47:15 -04:00
Arokha Sieyes
020c2a06f1 POLARIS: Communicator small refactor 2018-03-15 23:47:00 -04:00
Leshana
a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00
Anewbe
5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Cameron653
b4c3328878 Adds an alt vulp tail style. 
It's the first frame of the default, constantly wagging one the species gets by default.
 2018-03-14 01:36:49 -04:00
Anewbe
b2b4329c4b Merge pull request #5056 from Serithi/master 
I h*ckin' did an ambient music.
 2018-03-13 21:13:34 -05:00
Anewbe
7ee187d5d1 Merge pull request #5038 from VOREStation/pol-wiggle-wiggle-paw 
Adds wiggles to crawling
 2018-03-13 21:12:51 -05:00
Anewbe
6c2d9aa518 Merge pull request #5057 from Nalarac/Durasteel 
Fixes Durasteel Alloying Producing Slag
 2018-03-13 16:48:18 -05:00
Leshana
cba2d187bc Merge pull request #3228 from VOREStation/aro-prmsyn 
Block prometheans from using synthparts
 2018-03-13 12:46:12 -04:00
Arokha Sieyes
b68a943443 POLARIS: Clean up adminpm logs 2018-03-13 10:25:29 -04:00
Leshana
57ed0f6e9e Sundry Runtime Fixes - March (#5047) 
* Fixes Runtime in tools.dm,239: undefined variable /mob/living/simple_animal/retaliate/solargrub/var/handcuffed

* Add logging to help identify the cause of runtime in examining zshadow mobs.

* Fix Runtime in buckling.dm,165: Cannot execute null.forceMove().

* Fixes  Runtime in robot_items.dm,31: Cannot read null.origin_tech

* Fixes Runtime in paper_bundle.dm,183: Cannot read null.loc
 2018-03-13 00:13:19 -05:00
Arokha Sieyes
0dbb0b19df Block prometheans from using synthparts 2018-03-12 23:00:12 -04:00
Leshana
4023b3b00f Merge pull request #3119 from VOREStation/wip-pipe-construction 
Preliminary rewrite of pipe construction.
 2018-03-12 21:28:46 -04:00
Aronai Sieyes
de9a37495c Merge pull request #3225 from VOREStation/aro-tooltips 
Tooltip framework + Mob tooltips
 2018-03-12 21:28:06 -04:00
Arokha Sieyes
a81b925614 POLARIS: Reduce double admin logs 2018-03-12 21:06:18 -04:00
Arokha Sieyes
13f506ba60 POLARIS: Rename make_nametag_name/desc 2018-03-12 20:25:36 -04:00
Aronai Sieyes
8bc05d2a2e Merge pull request #3220 from VOREStation/aro-lwnerf 
Reduce lightweight trait point return
 2018-03-12 18:38:28 -04:00
Aronai Sieyes
2f0ab06a25 Merge pull request #3223 from VOREStation/aro-fixadmpm 
Readd include_name param on key_name because it's used
 2018-03-12 18:38:09 -04:00
Aronai Sieyes
23a50382e0 Merge pull request #3219 from VOREStation/aro-addedlogs 
Log additional engine information to game log
 2018-03-12 18:28:56 -04:00
Aronai Sieyes
d70c8c48c3 Merge pull request #3218 from VOREStation/vplk-runtime-fixes 
Runtime Fixes - March
 2018-03-12 18:28:20 -04:00
Aronai Sieyes
7555fb240c Merge pull request #3214 from Little-119/multi-bug-fixing 
Fixes #3209, fixes the cancel button in ears/wings/tail selection clearing the respective selection
 2018-03-12 18:27:58 -04:00
Aronai Sieyes
74bda5de54 Merge pull request #3212 from VOREStation/aro-subtlesani 
HTMLDecode vorestation log types
 2018-03-12 18:27:47 -04:00
Aronai Sieyes
540bfecf9e Merge pull request #3211 from VOREStation/aro-topic 
POLARIS: Move Topic() log to debug_log
 2018-03-12 18:27:39 -04:00
Aronai Sieyes
99022117dc Merge pull request #3206 from Mewchild/rdcomms 
Gives RD explorer comms
 2018-03-12 18:27:00 -04:00