cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 15:06:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,498 Commits 66 Branches 25 Tags
ReddeyfishVor-patch-2
Commit Graph
20903 Commits
Author SHA1 Message Date
Aronai SieyesandGitHub 6bae35b201 Merge pull request #3469 from VOREStation/lore-fix-redo 
Lore fixes, v1.01a
 2018-04-18 13:57:49 -04:00
NeverKnowWhyThisandAronai Sieyes 5c234b773a Teshari stuff (#3467) 
* Teshari stuff

-Adds a head to belly colouration for Teshari body marking
-Adds a smaller feathered alternative body marking
-Adds a Teshari mohawk hairstyle
-Adds a second option for Teshari tai (colorable)
-Adds a snowflake tail for Schae Shooki
-Adds an option to have ears on a teshari

* Changed names

* Moved sprite to correct .dmi

* Moved tashari_fluffymohawk to it's correct location

* Removed old tag

* Name edits, fluff item removed until approved correctly

I wasn't aware of SCA's for tails, I'll have it go trough the process normally.

* Minor name edit

* Modified body_parts to correctly reflect sprite

* Namefix

* Modified sprites and code that called upon them

* More spritefixes, reworked colouring

* More minor tailtweaking

* More fixes, underfluff is now working, but still needs the sprite adjusted to fit properly

* Small feathers are showing up, but more sprite issues to fix

* Modified Mohawk to show up on the character, sprites still aren't being loaded correctly. And I don't understand why it's happening

* Fixed markings, mohawk more ear styles based of the original

* Minor edit to heel fluff
 2018-04-18 13:57:31 -04:00
Arokha Sieyes 1bfe702e5e Rewrite shadekin update_icons() 
No more ma usage, use SSoverlays, fix typing indicator bug
 2018-04-18 13:50:13 -04:00
Verkister 88c1a7d845 Fixes borg synth sheet naming when depleted to 1 
-The thing changing the sheet stack names to singular/plural no longer breaks the naming for borg sheet synthesizers.
 2018-04-18 16:07:36 +03:00
MarinaGryphonandAnewbe 9e57b11a87 Fixes various implant/admin verb typos (#5177) 
* Removes 'independant'

* Update Space Station 13 areas.dm

* Fixes the AI law typo

* Fixes another typo.

Somewhat out of scope(?), but it's just a typo.
 2018-04-17 23:05:12 -05:00
AnewbeandGitHub 31922d8f37 Merge pull request #5174 from Verkister/patch-13 
Fixes simplemob icons when killed while resting.
 2018-04-17 22:58:54 -05:00
ReddeyfishVorandGitHub 2a23588c93 Set new bellies to item friendly by default 2018-04-17 19:35:57 -07:00
ReddeyfishVorandGitHub 0a4bc19d34 Prevent glass ornaments from being digested. 2018-04-17 19:08:06 -07:00
Leshana b45e065a96 POLARIS: Fix emitters connected to powernet remotely. 
Ensure when we unanchor an emitter that we disconnect from powernet.
 2018-04-17 20:00:29 -04:00
Leshana 7e6031c2b1 POLARIS: Fix conveyors on dynamically loaded maps obeying switches. 
Converted conveyors New() to initialize() so that runtime loaded maps will have conveyors and switches find each other.
 2018-04-17 20:00:28 -04:00
Arokha Sieyes f04aeac6ca Add ability for shapeshifters to change ears, tails, wings 2018-04-17 16:05:57 -04:00
VerkisterandGitHub a99bbda1e7 Makes vorepanel autoupdate only when needed 
Automatic updates now only happen to connected preds and prey just once once per cycle and only if something has changed.
 2018-04-17 11:36:19 +03:00
Reddeyfish ec6c9b4f00 quick fix for coin values not working 2018-04-16 17:15:26 -07:00
VerkisterandGitHub 03ab2fef08 Updates sickshot description. 
Also making it little more clear that the only way to get victims out of uncooperative or dead things is no longer live human exclusive.
 2018-04-16 10:48:25 +03:00
ReddeyfishVorandGitHub 1e256b9359 Merge pull request #116 from CHOMPstation/ReddeyfishVor-mobSpawner 
Reduce mining mob spawner frequency
 2018-04-16 00:47:48 -07:00
ReddeyfishVorandGitHub 13d853abb5 Re-add 'glorious death' text to cables. (#114) 
* Re-add 'glorious death' text to cables.

* Fix indentation
 2018-04-16 00:45:08 -07:00
ReddeyfishVorandGitHub a5f700e064 Reduce mining mob spawner frequency 2018-04-16 00:32:48 -07:00
atermonera 5411e74e1a Moved defines to a __define file 2018-04-15 18:32:51 -07:00
Mewchild b08357a068 Got dang quotation mark 2018-04-15 17:22:21 -05:00
Mewchild 8b469c4ec7 Adds Zigfe's Fluff Item 2018-04-15 17:11:08 -05:00
ReddeyfishVorandGitHub 7298cb7a9a Merge pull request #113 from ReddeyfishVor/virgoPull 
Virgo pull
 2018-04-15 12:12:54 -07:00
Leshana cfdbfafddf Comment out defunct mundane news event from our custom event lineup. 2018-04-15 14:56:39 -04:00
Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
 2018-04-15 14:19:36 -04:00
Reddeyfish 0af8620ee1 Merge branch 'virgoMaster' into virgoPull 2018-04-15 11:06:40 -07:00
Leshana 9345d74940 Close infinite bluespace crystal loophole in telesci computer construction. 
Default starting_crystals to zero, if it is ever mapped in the mapper can customize the number, but in-game construction will start with zero.
Also convert New() to initialize.
 2018-04-15 11:56:43 -04:00
VerkisterandGitHub 3d8c916585 Fixes simplemob icons when dying while resting. 
-Makes the death proc stop simplemobs resting before the icon update so the dying mobs will no longer end up stuck with resting icon instead of the dead one.
 2018-04-15 13:52:58 +03:00
ReddeyfishVorandGitHub 4b9b8c1818 Make supply demands more rare 2018-04-14 23:23:06 -07:00
ReddeyfishVorandGitHub 253638d459 Modify redemption costs, iron works in mint now (#110) 
* Modify redemption costs, iron works in mint now

* Restore comma overwritten by byond save
 2018-04-14 22:53:40 -07:00
ReddeyfishVorandGitHub 3887bd59cd Merge pull request #111 from ReddeyfishVor/newEvents 
Add moderate severity requirement for electrification
 2018-04-14 22:53:29 -07:00
Reddeyfish a6bed61e77 add asteroidMobs 2018-04-14 22:33:43 -07:00
Spades 4a3a712471 ONI ship names, updated work roles 2018-04-14 23:38:27 -04:00
Spades c8129325fb May as well do this now. 2018-04-14 20:19:21 -04:00
Spades cc39778217 Lore fixes, v1.01a 
The "a" stands for arbitrary version control.

Also I had no idea how to do this correctly so I just copypasted like an
asshat into a new branch. :B
 2018-04-14 20:14:10 -04:00
HzDonutandAronai Sieyes 700c902d14 Modified LeMat Fluff Weapon (#3337) 
* LeMat

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm
 2018-04-14 19:41:19 -04:00
ReddeyfishVorandGitHub 5bf751f4f2 Mimics no longer have tooltips 
This allows them to better perform their role, hiding as an object
 2018-04-14 11:09:41 -07:00
ReddeyfishVorandGitHub d65294a796 Add moderate requirement for electrify 
Creates a minor severity version of the event that only damages, removes safeties, and bolts the door.
 2018-04-14 10:37:58 -07:00
Reddeyfish 731187184d Add moderate severity requirement for electrification 2018-04-14 10:31:55 -07:00
SpadesandAronai Sieyes 8f7015d409 Lore updates (#3430) 
* Lore-updates

This PR is entirely stuff to update in-game content to match lore on the
wiki.

I haven't decided if it's done or not.

* Let's first make it actually work

* Fixes a few things, also adds ONI

* [screams in feeling]

* Fixes some lore shit
 2018-04-14 12:58:42 -04:00
Aronai SieyesandGitHub 2e0c271ac2 Merge pull request #3458 from VOREStation/aro-3457 
Probably fixes #3457 - Paper plane creation weirdness with paper
 2018-04-14 12:57:57 -04:00
Aronai SieyesandGitHub 5d8f970d02 Merge pull request #3462 from VOREStation/aro-protbuckle 
Fix a few Protean bugs
 2018-04-14 12:56:30 -04:00
Aronai SieyesandGitHub eb49e34378 Merge pull request #3456 from VOREStation/aro-vpfix 
Let's not add 'DM_TRANSFORM' once per time you've opened the vp
 2018-04-14 12:53:24 -04:00
Arokha Sieyes 84bbfcc787 Fix infinite loop of metal usage due to mismatch in values 2018-04-14 12:20:50 -04:00
Arokha Sieyes be50f394a6 Transforming to/from protean blob unbuckles riders 2018-04-14 11:12:46 -04:00
KetraiandGitHub 6ed59d63c5 Update recipes_microwave_vr.dm 2018-04-14 14:17:13 +02:00
KetraiandGitHub 6a94efd5da Makes donuts less of a strain on resources. 
considering you can put 6 donuts in a box, and they're supposed to be a small food item... this overrides all the donuts to use dough slices instead of a full wad of dough. 

Literally, who would realistically use two boxes of flour, six eggs, and whatnot to make one batch of donuts?
 2018-04-14 12:07:22 +02:00
Arokha Sieyes 4d80cd8df5 Proteans unbuckle targets before blobbing them 2018-04-13 21:08:06 -04:00
Reddeyfish bbcd0f24e0 Add several new events 2018-04-13 18:03:42 -07:00
Arokha Sieyes e9009507d8 Remove Aronai custom bag 
Medical bags ARE blue now, I don't need a custom blue one, just the ID that came in it.
 2018-04-13 20:21:25 -04:00
Arokha Sieyes ee73a9d519 Probably fixes #3457 - Paper plane creation weirdness with paper 2018-04-13 11:51:25 -04:00
Arokha Sieyes c2c3b08db6 Let's not add 'DM_TRANSFORM' once per time you've opened the vore panel, okay 2018-04-13 11:29:49 -04:00