cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,087 Commits 7 Branches 0 Tags
5033e705f24680bdc4cd48950f923de97aaad708
Commit Graph

174 Commits

Author SHA1 Message Date
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
61fce152d5 Merge pull request #12974 from foopwo/borgotoys 
Adds a couple of new toys for cyborgs.
 2022-05-15 20:15:29 +00:00
Casey
765f4cd2b3 More Upgrade Modules for Borgs 2022-03-12 20:44:57 +00:00
Nadyr
89168e2c7d powder that makes you say yes 2021-12-12 04:22:41 -05:00
Aronai Sieyes
4b2fa3836d Adds Altevian Language & ATC Fluff 2021-12-10 01:46:15 +00:00
Anthony Rodriguez
15dd652d8b Updating to reflect proper CHOMPEdit and nesting 2021-08-30 18:19:30 -07:00
Anthony Rodriguez
be2e0a0609 Altevian & Squeakish Language and ATC Addition. 2021-08-30 14:52:43 -07:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
2f8602243d Merge pull request #9614 from Heroman3003/belly-cap-fix-rename 
Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
 2021-01-27 02:24:52 +00:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
lbnesquik
c01019c25e Add a belly size upgrade for hounds: 
- Researchable upgrade. It fits only hounds. It doubles the capacity of their sleeper for items. Usable only once. This does not affect number of patients.
 2020-08-05 14:53:24 +02:00
Amy
51d2c98e33 Adds dragon language, gao emote w/ sound 2020-07-20 00:49:05 -05:00
Atermonera
87333d9c25 Add mob/living stat setter and observer 2020-03-23 22:47:44 -04:00
Unknown
10f290106c Ports pan-slavic from Baystation 2019-09-18 15:57:30 -04:00
Novacat
ab5710a015 Merge pull request #4881 from Heroman3003/borg-resization 
Borgs are now in on fun of size-related features
 2019-04-11 12:35:21 -04:00
Unknown
c4860391b6 Conflict Resolution 2019-04-06 14:47:21 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Heroman
92956bc258 Added sizechanging module and size pref respect for borgs 2019-03-30 07:56:33 +10:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Heroman3003
1aef94ae0e Module change and reset animations for borgs (#3210) 
* Added robot module reset and change animation

* changed some procs to more appropriate ones

* removed unnecesary sleep()

* readded intialize proc for_temp_visual
 2018-03-16 20:35:08 -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
Cerebulon
b7090d7df2 Adds Tajaran Akhani language. (#5032) 
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.

* Gives the language a colour distinct from Siik.

* Changelog
 2018-03-11 16:55:08 -05:00
Verkister
8cffc2298c Readies our borg stuff for next sync fixes. 
-Fixes the default module icon missing from our _vr.dmi
-Makes our custom modules enable ui_style_vr to pull the hud icon from our dmi instead.
-Makes relogging etc not revert to default ui file if ui_style_vr is enabled for the borg.
-Moves the clumsy VS edit borg reset stuff to a more appropriate place.
-Adds the recently fixed attack anim offset fix and the ui_style_vr to the reset module.
 2018-03-07 11:29:46 +02:00
MisterLayne
21c9cd0a05 fixes code, and adds changelog (hope I did it right) 2018-03-06 20:52:55 -05:00
Leshana
3a94638dbf Merge pull request #3156 from Verkister/wideborgs 
Small wide/dog borg tweaks/fixes
 2018-03-06 09:43:32 -05:00
Verkister
9eeb4f0f65 Small wide/dog borg tweaks/fixes 
-Adds a new var to specify nonstandard borg sprite sizes. No longer dogborg exclusive.
-Makes the dogborg var usable for standard sizes as well (for the special features like rest poses and gun/gut overlays)
-Makes the borg reset module reset the forementioned vars.
-Excludes wideborg from the standard size polaris/vore vr_sprite_check to avoid unintended default file reverts.
 2018-02-28 10:42:40 +02:00
Heroman3003
859483c6cf maybe fix? 2018-02-28 17:40:13 +10:00
Heroman3003
67105d921c Fixed Language upgrade not being removed after being applied 2018-02-28 16:46:53 +10:00
Arokha Sieyes
3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
 2018-02-27 21:27:35 -05:00
elgeonmb
8c9c99f817 Adds new languages (#4961) 
* langs

* humanity first

* humanity first but for real this time

* i know how to spell good

* grumbles
 2018-02-26 21:21:50 -06:00
Leshana
30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-02-23 21:55:42 -05:00
Cyantime
b0a8ebcbb7 Robot upgrade fixes 2018-02-21 13:12:34 -05:00
Leshana
7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
 2018-02-17 00:35:29 -05:00
Arokha Sieyes
edd24126aa Fixes lack of borg fullbright with mesons etc 2018-02-15 03:10:04 -06:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
mistyLuminescence
0d458b204e Adds the advanced health analyzer (#4326) 
* WIP - advanced health analyzer

* Adds the advanced health analyzer.

* Updates radiation levels

* Fixes travis and removes snark

* Fixes a bug that wasn't my fault (for real)

* Adds tiers.

* Phasic sounds cooler

* Fixes sprites
 2017-12-03 17:36:51 -06:00
Cyantime
2ce91bceef Allows silicons to use the added languages 2017-11-29 21:44:20 -05:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
MisterLayne
436eaa1efb Adds language module. 2017-10-26 15:43:25 -04:00
Mechoid
8939d21014 Stops MMIs created with a ghosted brain from being put into cyborgs. (#4110) 
* Stops MMIs created with a ghosted brain from being put into cyborgs.

* Fixes a typo and wording.
 2017-10-19 13:59:06 -05:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Anewbe
c9f83a9d68 Merge pull request #3769 from PrismaticGynoid/forgottenlanguages 
Brain transplants, synthetics, and languages
 2017-09-16 15:35:29 -05:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00