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
54,888 Commits 5 Branches 0 Tags
95ff8c2080a3b5f08d62df0f25fc91c50c193fbc
Commit Graph

11083 Commits

Author SHA1 Message Date
Novacat
d27f46492e Merge pull request #8436 from Rykka-Stormheart/shep-dev-medbot-tipping 
Port Medibot Tipping!
 2020-07-20 12:56:37 -04:00
Amy
51d2c98e33 Adds dragon language, gao emote w/ sound 2020-07-20 00:49:05 -05:00
Rykka
e868d61994 Port Medibot Tipping! 
Ethics memes aside, the idea off people being caught off guard at their guilt for causing harm to inanimate objects is really funny to me, and feels extra relevant to SS13. Considering people already regularly get in fights and maim each other over harming station pets, I picture this being a great source of arguments and fights ICly over what torturing a cute lil' medbot says about you.

tl;dr this PR lets you tip over medbots which prevents them from moving or healing, and they'll slowly get more and more distressed and desperate asking for help from people around them. After a few minutes, if no one helps right them, they'll manage to right themselves up and snitch on whoever tipped them over to medical so the psychologist can keep an eye on them.
 2020-07-20 01:44:24 -04:00
Cadyn
046266f504 Quick fix for more dumb typos aaa 2020-07-19 00:04:59 -07:00
Cadyn
9ee33fcd85 hot/cold-blood conflict prevention + points balancing 2020-07-18 23:51:00 -07:00
Cadyn
473f7a6c99 Fixed another silly mistake and a dumb grammar mistake. 2020-07-18 23:22:56 -07:00
Cadyn
161cc4237d Fixed a typo and added exclusions in addition to ACTUALLY TESTING IT THIS TIME :) 2020-07-18 23:18:13 -07:00
Cadyn
84b6621881 Added more custom species traits for temperature resistance 2020-07-18 22:46:06 -07:00
MrSign
9bff53564d Update dog_sleeper_vr.dm 2020-07-19 13:46:01 +10:00
ShadowLarkens
2992efb823 TGUI v4.0 2020-07-17 22:09:26 -07:00
Rykka
3974d7e87f Last Push - Everything is working, just needs testing! 2020-07-16 19:52:20 -04:00
ShadowLarkens
a20eef5bfb TGUI Camera Console - Part 1; Plain console done 
# Conflicts:
#	code/_onclick/hud/skybox.dm
#	code/controllers/subsystems/skybox.dm
#	code/game/machinery/computer/camera.dm
#	tgui/packages/tgui/public/tgui.bundle.js
 2020-07-16 16:17:36 -07:00
ShadowLarkens
1cded01770 TGUI v3.0 
This ports TGUI, and makes the old nano crew monitor and the disposal
bins use it as first examples.
 2020-07-16 14:59:45 -07:00
Atermonera
ed28d64eb5 Merge pull request #7336 from Cerebulon/mouseSpeed 
Mice Go Fast Again + Rat Sprites
 2020-07-15 14:37:44 -04:00
Shadow-Quill
aab1c57962 Removes Punpun's sensors (#7332) 2020-07-13 22:26:00 -04:00
Novacat
97d63565fd Merge pull request #8390 from Rykka-Stormheart/shep-dev-booze-traits 
Add Booze Traits!
 2020-07-13 15:06:36 -04:00
Killian
70e9c69ff3 pain_mod implementation (#7330) 2020-07-13 12:09:57 -04:00
Rykka
55e9bca231 Add Booze Traits! 
Upstream port of https://github.com/Yawn-Wider/YWPolarisVore/pull/619

Credit goes to @KillianKirilenko for this, I just ported this upstream and put all the traits in neutral.dm as per admin request!

**Description:**
This uses the universal alcohol_mod to allow for increasing/reducing the effects of ethanol based on the trait you've taken. Basically? You can get drunk more or less quickly. This does not change how fast you die when you start taking liver damage/tox, this only affects how fast alcohol makes you drunk.
 2020-07-12 11:57:36 -04:00
Atermonera
a697e83ebd Merge pull request #7326 from Neerti/arrival_announcement_fix 
Arrivals Shuttle Message Fix
 2020-07-09 18:29:38 -04:00
David Winters
048ede4773 added missing emote to *vhelp 2020-07-07 13:52:41 -04:00
David Winters
c7885af252 Merge branch 'master' into spellcheck 2020-07-07 13:46:56 -04:00
David Winters
ab10ff2f8c Removed drop pouches edit 2020-07-07 13:46:27 -04:00
David Winters
c909d1ab1b Revert "Minor typo fixes" 
This reverts commit 0c3fa4743c.
 2020-07-07 13:44:07 -04:00
lbnesquik
a73f330d59 Clarify that this isn't for goddamn replicants. 2020-07-05 23:24:35 +02:00
lbnesquik
da9e9fec8f Bring back hemophilia. No, it's not a crime! 2020-07-05 23:09:58 +02:00
lbnesquik
c7c9764319 Add a check to custom virgo traits to limit synths from taking certain ones. 2020-07-05 23:09:40 +02:00
Novacat
384c22f510 Update mob_defines.dm 2020-07-04 08:58:10 -04:00
Novacat
32eb36ba25 Update mob_defines.dm 2020-07-04 08:57:04 -04:00
Kates
e62938bc61 Add clickable action buttons from /TG/, rework a lot of backend and other improvements. 2020-07-03 18:29:29 -04:00
Novacat
33e07ac92d Merge pull request #8091 from Cameron653/transparency_v2 
Adds the ability for prometheans to toggle transparency.
 2020-07-03 17:49:45 -04:00
C.L
13844c6ece Added clarification to kick travis into working. 2020-07-03 17:38:40 -04:00
Novacat
50fd7fcfd2 Merge pull request #8354 from VOREStation/Verkister-patch-1 
Fixes mouse movespeed
 2020-07-02 22:21:01 -04:00
Novacat
d5a514c402 Merge pull request #8355 from Screemonster/mobvoredefaults 
defaults voremobs to not care about digestibility
 2020-07-02 22:20:39 -04:00
DESKTOP-4BUBN9N\Mike
2f9389bec2 defaults voremobs to not care about digestibility 2020-07-03 02:37:59 +01:00
Verkister
5d6851db1e Fixes mouse movespeed 
Removes the mega-haste speed from mice caused by a var that wasn't updated for the new movement code.
 2020-07-02 14:56:30 +03:00
Layne
7b7a1b853e ice cream 2020-07-01 18:56:09 -04:00
Novacat
c12b655f68 Merge pull request #8339 from VOREStation/upstream-merge-7304 
[MIRROR] Offload Defibrillatability from NO_SCAN
 2020-06-28 12:50:32 -04:00
Heroman
38be62d62b Vox speech adjustments 2020-06-27 18:32:52 +10:00
Atermonera
5fbc4f3189 Merge pull request #7304 from KillianKirilenko/kk-bio 
Offload Defibrillatability from NO_SCAN
 2020-06-25 15:44:49 -04:00
Atermonera
736fdab6e3 Merge pull request #7273 from Cyantime/obs 
Observing improvements
 2020-06-24 11:36:18 -04:00
Novacat
8c3804d59a Merge pull request #8310 from Verkister/wideboyz 
A bunch of mob sprite tweaks plus a few new ones.
 2020-06-19 21:12:43 -04:00
Verkister
dc080ea01b Merge branch 'wideboyz' of https://github.com/Verkister/VOREStation into wideboyz 2020-06-19 12:01:17 +03:00
Verkister
6ee0ed34ce adds custom otie guts 2020-06-19 11:58:28 +03:00
Verkister
a32c646a2e Update wolf.dm 2020-06-19 11:15:43 +03:00
Verkister
13a0881fcf Adds those mobs in the code after all 
I'm fucking unstoppable tonight gonna crash soon hnn
 2020-06-19 01:33:41 +03:00
Heroman
56c79c2c6e Makes Unathi's mob_size MOB_MEDIUM to match all other species 2020-06-17 07:19:06 +10:00
Atermonera
6fe7876224 Merge pull request #7286 from Mechoid/FixComboDamage 
Combo damage type repair.
 2020-06-16 03:31:44 -04:00
Aronai Sieyes
2798866f20 Merge pull request #8267 from SweetBlueSylveon/Pips-mess-of-clowns 
Pips mess of clowns
 2020-06-16 00:47:16 -04:00
SweetBlueSylveon
2105198db8 Cuts down on code. 
Cuts down on code by removing a large chunk of redundant lines wrieeten for every mob.
 2020-06-15 12:03:01 -07:00
Novacat
6c899ae143 Merge pull request #8276 from VOREStation/Verkister-patch-2 
Earlyports prommie passive gain fix
 2020-06-14 15:47:47 -04:00