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
53,609 Commits 5 Branches 0 Tags
2aaca960811d5a216314e64a14d8429e9bcd0ee4
Commit Graph

25320 Commits

Author SHA1 Message Date
Neerti
2aaca96081 Reduces spam from new event system. (#7355) 2020-07-22 06:04:38 -04:00
Novacat
8019c35d79 Merge pull request #8377 from lbnesquik/Kot-Smell-stuff 
Add a smell system, closely matching the flavor system.
 2020-07-21 18:14:01 -04:00
Novacat
8b7d087259 Merge pull request #8437 from Tenryumi/dragon-stuff 
Adds dragon-y language and "*gao" emote
 2020-07-21 18:12:43 -04:00
Novacat
453fb2c708 Merge pull request #8432 from cadyn/custom-temp-resistance 
Added more custom species traits for temperature resistance
 2020-07-21 18:11:58 -04:00
Novacat
709d926e33 Merge pull request #8422 from ShadowLarkens/tgui 
TGUI-V4 w/ Camera Console
 2020-07-21 18:09:40 -04:00
Cadyn
ca7092c80c Minor grammar changes 2020-07-21 14:48:50 -07:00
Cadyn
fac86ebbd5 Combined opposite resistance and prone traits into nuetral adaptation traits and removed blooded traits. 2020-07-20 15:45:09 -07:00
Amy
ebaa88764d Brightens D'Rudak'Ar language color 2020-07-20 16:02:39 -05:00
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
Novacat
1df2bf91e3 Merge pull request #8428 from cadyn/tf-organ-reset 
Added organ reset to the transformation code
 2020-07-20 01:07:22 -04:00
Novacat
a07481aa93 Merge pull request #8431 from MrSign/sciborggutupgrade 
Increases the amount of items a sci-borg gut-analyzer can consume to 10.
 2020-07-20 01:05:44 -04:00
ShadowLarkens
126cc6b5da Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc. 2020-07-19 20:46:12 -07:00
Atermonera
a26d43c7f9 Merge pull request #7353 from Shadow-Quill/CheckExportTick 
[SEMI-URGENT] Fixes hanging/crashing server when using the Export-Chatlog verb in OOC
 2020-07-19 23:38:46 -04:00
ShadowLarkens
4ccbe71a51 setSharedState fix (tgstation/tgstation#52323) 2020-07-19 17:30:46 -07:00
Kates
a559223fa8 Correct a small typo 2020-07-19 17:47:48 +02: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
2d98903cca Add Fancy and Lock UI options, and fix an issue with fancy TGUI 2020-07-17 22:39:52 -07:00
ShadowLarkens
2992efb823 TGUI v4.0 2020-07-17 22:09:26 -07:00
Cadyn
ca43b44743 Added organ reset to the transformation code to fix problems with promethean->Zorren and the such causing suffocation because organs weren't properly changed during the tf 2020-07-17 21:44:07 -07:00
ShadowLarkens
58d1e52311 Whoops 2020-07-16 19:03:05 -07:00
ShadowLarkens
a1eb54e615 Convert all old nano_module crew monitors to TGUI, fix crew monitor for virgo 2020-07-16 18:58:37 -07:00
ShadowLarkens
a98b8f9764 Virgo fixes for TGUI Cam Console 2020-07-16 17:37:30 -07:00
ShadowLarkens
62b9315b5a TGUI Camera Console Part 3: Modular computers support 2020-07-16 16:19:49 -07:00
ShadowLarkens
e9f082d228 TGUI Camera Console Part 2; Moved to tgui_module, pending modular computer port 
# Conflicts:
#	code/game/sound.dm
#	tgui/packages/tgui/public/tgui.bundle.js
 2020-07-16 16:18:43 -07: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
5fa431e37f Update to fix things after PolarisSS13/Polaris#7326 & update nanomap again 2020-07-16 15:00:39 -07:00
ShadowLarkens
2f298c1039 Final adjustments to the crew monitor, calling this good and happy. 2020-07-16 15:00:31 -07:00
ShadowLarkens
07adb888e2 Make TGUINanoMap actually somewhat as good as old NanoMap 2020-07-16 15:00:23 -07:00
ShadowLarkens
c1f037fc33 Minor fix for not repeating checks that default state already does 2020-07-16 14:59:52 -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
Novacat
98535d6699 Merge pull request #8416 from VOREStation/upstream-merge-7338 
[MIRROR] Fix Pink Slime Extract Description
 2020-07-15 16:03:17 -04:00
Atermonera
ed28d64eb5 Merge pull request #7336 from Cerebulon/mouseSpeed 
Mice Go Fast Again + Rat Sprites
 2020-07-15 14:37:44 -04:00
Atermonera
d0a746358f Merge pull request #7338 from r4d6/patch-1 
Fix Pink Slime Extract Description
 2020-07-15 14:37:31 -04:00
Novacat
94596abe76 Merge pull request #8407 from VOREStation/upstream-merge-7333 
[MIRROR] Flavour Enhancement: Guns
 2020-07-14 08:35:48 -04:00
Novacat
cd357dafd4 Update crossbow.dm 2020-07-14 01:18:35 -04:00
Novacat
659ec1d31b Merge pull request #8406 from VOREStation/upstream-merge-7327 
[MIRROR] Quick create improvements
 2020-07-14 01:16:14 -04:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -04:00
Novacat
3b6040771b Update create_object.dm 2020-07-13 22:37:36 -04:00
Kates
b6003d6cd0 Quick create improvements 2020-07-13 22:27:16 -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
0ae99a1407 Fix Slow Comfortable Screw Against the Wall 
The drink was set to strength = 0 resulting in a multiply by 0 and infinite alcoholism. You'd literally commit alcohol coma and instant liver death on drinking this.
 2020-07-12 12:11:42 -04:00