cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,892 Commits 5 Branches 0 Tags
82b755bab8dccd78f6849fa45d23e50849bd9521
Commit Graph

20610 Commits

Author SHA1 Message Date
Arokha Sieyes
82b755bab8 Allow K9s to use the hailer and law emotes 
Fixes #3447
 2018-04-19 18:08:13 -04:00
Arokha Sieyes
759bec84d0 Nerf marble 
Please.
 2018-04-19 02:36:02 -04:00
Aronai Sieyes
a7e91cb065 Merge pull request #3463 from Ketrai/patch-9 
Makes donuts less of a strain on resources.
 2018-04-18 14:06:02 -04:00
Aronai Sieyes
35ec513b28 Merge pull request #3452 from VOREStation/aro-sync-04122018 
Polaris Sync 04-12-2018
 2018-04-18 14:04:27 -04:00
Aronai Sieyes
88a89d8149 Merge pull request #3474 from VOREStation/vplk-fix-telesci 
Close infinite bluespace crystal loophole in telesci computer construction
 2018-04-18 13:58:48 -04:00
Aronai Sieyes
b492d61d86 Merge pull request #3482 from Verkister/patch-18 
Makes vorepanel autoupdate only when needed
 2018-04-18 13:58:39 -04:00
Aronai Sieyes
fb7ca15439 Merge pull request #3477 from Mewchild/MC-Zaozao 
Adds Zigfe's Fluff Item
 2018-04-18 13:58:28 -04:00
Aronai Sieyes
23b9ac22f5 Merge pull request #3480 from Verkister/patch-15 
Updates sickshot description.
 2018-04-18 13:58:17 -04:00
Aronai Sieyes
b6ef06a34d Merge pull request #3485 from VOREStation/vplk-april-fixes 
Sundry Fixes - Emitters, Bedsheets, Conveyors
 2018-04-18 13:58:05 -04:00
Aronai Sieyes
6bae35b201 Merge pull request #3469 from VOREStation/lore-fix-redo 
Lore fixes, v1.01a
 2018-04-18 13:57:49 -04:00
NeverKnowWhyThis
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
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
Verkister
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
Verkister
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
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
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
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
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
HzDonut
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
Spades
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 Sieyes
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 Sieyes
5d8f970d02 Merge pull request #3462 from VOREStation/aro-protbuckle 
Fix a few Protean bugs
 2018-04-14 12:56:30 -04:00
Aronai Sieyes
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
Ketrai
6ed59d63c5 Update recipes_microwave_vr.dm 2018-04-14 14:17:13 +02:00
Ketrai
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
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
Neerti
f80fe6a1c9 Optimizes Powercell Update Icons 2018-04-12 18:53:47 -04:00
Heroman3003
1ff2f26889 Fixed legcuffs checking for being handcuffed instead of legcuffed when put on 2018-04-13 05:00:18 +10:00
Aronai Sieyes
791b5a4155 Merge pull request #3387 from KasparoVy/small_raptor_big_problem 
Fix Teshari Tail-hair Rendering
 2018-04-12 12:03:58 -04:00
Aronai Sieyes
b08f0db2bb Merge pull request #3406 from Cameron653/SILENCEDMP5A5_FLUFF 
Adds SilencedMP5A5's fluff items
 2018-04-12 12:01:42 -04:00
Aronai Sieyes
b46816f01d Merge pull request #3436 from Verkister/patch-13 
Nerfs apex metabolism
 2018-04-12 11:52:10 -04:00
Aronai Sieyes
298def0af5 Merge pull request #3438 from Verkister/dur 
Adds deer taur.
 2018-04-12 11:51:42 -04:00
Aronai Sieyes
8afd5cad9a Merge pull request #3441 from Verkister/rous 
Adds giant rat voremob.
 2018-04-12 11:51:29 -04:00
Aronai Sieyes
ae4c5a0d95 Merge pull request #3443 from VOREStation/aro-digestaddons 
Adds 'mode addons' feature to bellies to replace several modes
 2018-04-12 11:51:15 -04:00
Arokha Sieyes
474bb3c8c8 Couple more Protean fixes, + darksight 
Fixes a blob transform check. Also they get a smidge of darksight (the minor trait). I'm sure they have expensive sensors, but giving them the taj darksight seems meh.
 2018-04-11 20:55:54 -04:00
Arokha Sieyes
4c604fb8da Adds 'mode addons' to bellies to replace several modes 2018-04-11 19:22:20 -04:00
Verkister
14ad23f8e6 mouse 2018-04-11 22:34:44 +03:00
Aronai Sieyes
b427bca859 Merge pull request #3423 from Verkister/newvoreagain 
Some vore tweaks. (new gurglemodes will hopefully be back in another PR)
 2018-04-11 14:37:20 -04:00
Verkister
2dec2545e5 Adds giant rat voremob. 
-Currently only available via pred crate/shenanigans.
-This dude is friends with regular mice but will gladly kick any other ass.
 2018-04-11 20:44:53 +03:00
Aronai Sieyes
2f04ff30cb Merge pull request #3433 from VOREStation/aro-protwork 
Fix another protean bug (resizing message)
 2018-04-11 10:23:44 -04:00