cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,398 Commits 10 Branches 0 Tags
c8af737592b3433d1e2ae8e9c57c333ce886be18
Commit Graph

29840 Commits

Author SHA1 Message Date
Arokha Sieyes
c8af737592 Merge pull request #2665 from Verkister/emptyguts 
Fixes bugs related to picking shit from empty belly content lists.
 2018-01-02 16:06:59 -05:00
Arokha Sieyes
51d90b3c76 Merge pull request #2661 from VOREStation/aro-shipwork 
Redoes the small cruiser
 2018-01-02 15:57:29 -05:00
Verkister
11a8ea16ef Fixes bugs related to picking shit from empty belly content lists. 
-Makes digestion modes "finish" once everything unprotected is gone.
-This also means your guts will no longer permagurgle fruitlessly while nothing but a shitty ID in there.
 2018-01-02 18:27:44 +02:00
Arokha Sieyes
3cb0dc8ddb Redoes the small cruiser 
On the ships map, the little one that was in the top left. Am I the only admin who's ever used the admin lewdship in our maps? This one is too big to fit at the station so it has a little shuttle. Maximum class, for hosting parties.

While editing the docking thing for the shuttle, also fixes the tether 'goodluckmcgee' shuttle docking at the station. Now it docks properly and the doors open like one might expect.
 2018-01-02 03:17:48 -05:00
Arokha Sieyes
ca9b36e6b1 Merge pull request #2651 from VOREStation/Cameron653-patch-2 
Makes the soulcatcher able to have 2048 characters
 2018-01-02 02:45:47 -05:00
Arokha Sieyes
2ad006c3b2 Merge pull request #2652 from VOREStation/Cameron653-patch-3 
Swaps two words around.
 2018-01-02 02:45:28 -05:00
Arokha Sieyes
63dd746cca Merge pull request #2659 from Cyantime/resleevehealth 
Prevents low health bodies from dying on creation
 2018-01-02 02:45:16 -05:00
Cyantime
e6d09798a6 Prevents low health bodies from dying on creation 2017-12-31 22:45:44 -05:00
Cameron653
9bcb4fb7ad no fun allowed 2017-12-31 21:37:27 -05:00
Cameron653
6841b5a6fe this here stuff 2017-12-29 20:01:23 -05:00
Cameron653
40cffda09e Update 13_soulcatcher.dm 2017-12-29 12:26:54 -05:00
Verkister
2874f018e8 Bodysnatcher message tweak. 
-Assume this. (tweaks out a hardcoded "his")
 2017-12-29 15:39:42 +02:00
Arokha Sieyes
7d16c2e8cd Merge pull request #2647 from VOREStation/aro-deadchat 
Fix admin deadchat
 2017-12-28 19:10:19 -05:00
Arokha Sieyes
49f27b6b54 Fix admin deadchat 
Would be nice.
 2017-12-28 18:53:42 -05:00
Arokha Sieyes
63e51f42be Merge pull request #2645 from VOREStation/microsync 
Microsync
 2017-12-28 18:40:02 -05:00
Arokha Sieyes
5e52ec5736 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into microsync 2017-12-28 18:21:06 -05:00
Arokha Sieyes
cb0a9f009d Allow ghosts to enter Soulcatchers 
Ghosts now have a verb "Join Into Soulcatcher" that lists all players, and they can pick one to ask them if they can join into their SC. If they don't have one, it notifies the ghost (this is less expensive than trying to crunch who has a soulcatcher and shortening the list. You can just deal with it okay??). You cannot get backed up if you joined this way, like there's no way to move from being a ghost to being in someone's head to being in a mob. You'd need to ghost and respawn normally. (This is intentional... no sneaky no-manifest people getting in).

And various other SC QOL things:
- Adds NMe and NSay verbs when you get a soulcatcher installed so you can use them in the text parser at the bottom of the window or click them in the verb list like a crazy person. The older emotes also still work.
- Prevents 'loop of madness' where both pred and prey have soulcatchers and it floods your log as it tries to decide who catches who
- Removes minds if the client is disconnected for a long time, or if the player ghosts out of the NIF
 2017-12-28 16:36:43 -05:00
Leshana
b88093a324 Fix a last-minute typo 2017-12-27 20:20:15 -05:00
Arokha Sieyes
447929ba53 Clarify extend vote wording 
Last? Only.
 2017-12-27 18:19:18 -05:00
Cameron653
d6be1e9b53 Merge pull request #2587 from Cameron653/FLUFF_ITEMS 
Birb fluff items
 2017-12-27 17:12:45 -05:00
Arokha Sieyes
509058b021 Merge pull request #2639 from VOREStation/aro-legwraps 
Add legwraps to loadout shoes list
 2017-12-27 15:57:10 -05:00
Arokha Sieyes
4374bef62a Merge pull request #2636 from VOREStation/aro-talkicons 
Flips talking icons to the right side
 2017-12-27 15:45:33 -05:00
Arokha Sieyes
e4d590f4e2 Add legwraps to loadout shoes list 
They're for digitigrade people who wanna look stylish!
 2017-12-27 14:49:32 -05:00
Arokha Sieyes
8a349ee87c Flips talking icons to the right side 
So they don't sit under the HUD icons half the time. Kind of annoying. This is how it used to be.
 2017-12-27 02:38:52 -05:00
Arokha Sieyes
9832e248b4 Update omnnihuds to use new flash protection method 2017-12-26 23:36:00 -05:00
Arokha Sieyes
84f31230d4 Readd clown/mime job constants 2017-12-26 23:35:50 -05:00
Arokha Sieyes
40f2dcc73b Fix unused proc in prometheans 2017-12-26 23:35:38 -05:00
Arokha Sieyes
80d69aa161 Organ coloring fix to read species var 
Since we use this var to determine how colors work
 2017-12-26 23:21:51 -05:00
Arokha Sieyes
5aad70fe29 More things for custom species to copy 
These two new vars
 2017-12-26 23:17:44 -05:00
Arokha Sieyes
d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018 
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.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/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2017-12-26 23:07:58 -05:00
Neerti
522a3b5f98 Merge pull request #4456 from VOREStation/vplk-frames 
Replaced bare numbers in frame construction with defined constants.
 2017-12-26 22:37:33 -05:00
Arokha Sieyes
b13cf41ff9 Merge pull request #2633 from VOREStation/aro-fluffidfix 
Fix two fluff IDs
 2017-12-26 20:11:48 -05:00
Arokha Sieyes
26b5c01c4c Merge pull request #2628 from kevinz000/patch-1 
Adds handholding
 2017-12-26 20:11:28 -05:00
Arokha Sieyes
08ea0ccfd5 Fix two fluff IDs 
Path changed and this ID split into two in the backend.
 2017-12-26 19:44:35 -05:00
Leshana
00a00bb1c8 Use mutable_appearance for HUD health overlays. 
This improves the issue of player mobs using excessive CPU every Life() tick.
* Testing determined the worst performance was actually the manipulation of the "healths" HUD doll's overlays.
* Switching to using a mutable_appearance helps quite a bit for little effort.
 2017-12-26 17:07:10 -05:00
BothNevarBackwards
4540f770d4 Lots of species stuff ported from Baystation (#4442) 
* Ports species based footprints from bay
- https://github.com/Baystation12/Baystation12/pull/17935
- https://i.imgur.com/ojAU373.png
- Unathi use claw on right
- Taj and tesh use paw in center

* Flash stuff glasses protection things

* Flash stuff actual thing

* Organ mult thingy

* Floaty eyes and cloak setup

* Species falling
 2017-12-26 14:28:21 -05:00
Arokha Sieyes
6ed496e810 Merge pull request #2591 from Cyantime/absolutepathing_customclothesvr 
Cleans up two custom item files
 2017-12-26 13:42:28 -05:00
Arokha Sieyes
dd21b0c56b Merge pull request #2627 from Cyantime/paths 
Updates expeditionary paths due to Polaris change
 2017-12-26 13:42:10 -05:00
Arokha Sieyes
c96100aeac Merge pull request #2629 from VOREStation/aro-niffix 
Fix NIF surgery post-update
 2017-12-26 13:41:24 -05:00
Anewbe
ddbf7138d9 Merge pull request #4455 from Woodratt/12242017_SCadditions_WR 
SC Stupid Sized Map Update
 2017-12-26 13:16:46 -05:00
Arokha Sieyes
fe2d09f17a Fix NIF surgery post-update 
This line was put into the wrong block (a good example of why relative pathing is bad, since it made it unclear where it was before in normal code).
 2017-12-26 01:50:04 -05:00
kevinz000
fca889a331 Update human_attackhand.dm 2017-12-25 20:36:16 -08:00
kevinz000
7d6e8c79e3 Handholding 2017-12-25 19:58:20 -08:00
Cyantime
9e573e69fb Updates paths due to Polaris change 2017-12-25 22:31:01 -05:00
Arokha Sieyes
c5b5f8ed39 Merge pull request #2622 from VOREStation/aro-nifheat 
Improves NIFSoft heatsink for synths
 2017-12-25 01:26:30 -05:00
Arokha Sieyes
5a7f24b41f Merge pull request #2620 from VOREStation/aro-sodafix 
Fix soda machine sprite
 2017-12-25 00:11:57 -05:00
Arokha Sieyes
db16af261a Improves NIFSoft heatsink for synths 
Wow, this ran out super fast. You get like 2 minutes of use, jeez. This makes it much longer. You also get a % heat sunk thing next to it in the NIF menu so you can see how far along you are.
 2017-12-24 23:40:34 -05:00
Arokha Sieyes
860661724f Fix soda machine sprite 
It's invisible!!!
 2017-12-24 20:20:36 -05:00
Atermonera
c8f6ef9e9f Merge branch 'master' into VR_Avatar 2017-12-24 15:50:21 -08:00
Atermonera
34dd521fb8 VR mobs can toggle opaque/translucent appearance 2017-12-24 15:42:13 -08:00