cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,425 Commits 10 Branches 0 Tags
95a1fade339304e76022433d48907d15af850c63
Commit Graph

32206 Commits

Author SHA1 Message Date
Repede
95a1fade33 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-04-20 09:03:58 -04:00
Aronai Sieyes
fa8f21673c Merge pull request #3506 from VOREStation/aro-portallocal 
Fix cascade portal teleporting
 2018-04-19 20:30:34 -04:00
Aronai Sieyes
7ead58510c Merge pull request #3483 from VOREStation/aro-sstailears 
Add ability for shapeshifters to change ears, tails, wings
 2018-04-19 20:26:23 -04:00
Aronai Sieyes
b42f8c3df2 Merge pull request #3501 from VOREStation/aro-is3478 
Cleans up custom species icon base code
 2018-04-19 20:26:13 -04:00
Aronai Sieyes
6f57022a0c Merge pull request #3448 from VOREStation/aro-taurriding 
Lazily implements taur riding
 2018-04-19 20:21:46 -04:00
Arokha Sieyes
86a0536705 Fix cascade portal teleporting 2018-04-19 20:17:29 -04:00
Arokha Sieyes
2cba96cf4c Switch to defines for custom species stuff 2018-04-19 19:34:10 -04:00
Aronai Sieyes
f03406754b Merge pull request #3492 from VOREStation/aro-marfix 
Rewrite shadekin update_icons()
 2018-04-19 19:24:36 -04:00
Aronai Sieyes
91b300df54 Merge pull request #3496 from VOREStation/aro-qpads 
Ports /tg/ Quantum Pads
 2018-04-19 19:24:18 -04:00
Aronai Sieyes
28c7a58ccf Merge pull request #3502 from VOREStation/aro-is3476 
Make farmbots fill 10x faster
 2018-04-19 19:05:59 -04:00
Aronai Sieyes
d28969360d Merge pull request #3500 from VOREStation/aro-is3490 
Rewrite brig timers to initialize properly
 2018-04-19 18:55:18 -04:00
Arokha Sieyes
7e993c95d3 Rewrite brig timers to initialize properly 2018-04-19 18:28:57 -04:00
Arokha Sieyes
569e8f08c3 Adds Quantum Pads 
Pad-to-pad teleporters, though they cost 75% of a diamond for each one (since they require a bluespace crystal each).
 2018-04-19 18:13:30 -04:00
Arokha Sieyes
82b755bab8 Allow K9s to use the hailer and law emotes 
Fixes #3447
 2018-04-19 18:08:13 -04:00
Arokha Sieyes
2904fa1bef Make farmbots fill 10x faster 2018-04-19 17:48:02 -04:00
Arokha Sieyes
1a349f77dd Cleans up custom species icon base code 
Fixes #3478
 2018-04-19 17:46:51 -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
80c8bb5e34 Merge branch 'master' into aro-taurriding 2018-04-18 14:01:50 -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
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
Leshana
989d8a727d POLARIS: Fix cutting of bedsheets while holding them. 
Cutting bedsheets while holding them dropped the resulting rags in the mob's contents.
 2018-04-17 20:24:06 -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
Arokha Sieyes
f04aeac6ca Add ability for shapeshifters to change ears, tails, wings 2018-04-17 16:05:57 -04:00
Repede
9da57c3865 fixed compile error 2018-04-17 12:34:48 -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
Repede
944be5528b Merge pull request #101 from ProbablyCarl/master 
Aphro Flower
 2018-04-16 20:48:37 -04: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
Carl?
69f54705c5 Update seed_packets_vr.dm 2018-04-15 14:22:04 -04:00
Carl?
065059fa4a Update seed_datums_vr.dm 2018-04-15 14:21:52 -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
Carl?
ba1bd60035 Add files via upload 2018-04-15 14:14:19 -04:00
Carl?
e0c8f74b88 Update seed_datums_vr.dm 2018-04-15 13:35:56 -04:00
Carl?
262d63f4ee Update trash_pile.dm 2018-04-15 13:32:40 -04:00
Carl?
676ec8a94c Update seed_storage_vr.dm 2018-04-15 13:28:51 -04:00
Carl?
67ec328617 Update seed_datums_vr.dm 2018-04-15 13:28:07 -04:00
Carl?
c108469229 Update seed_packets_vr.dm 2018-04-15 13:27:54 -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