cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 03:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,807 Commits 8 Branches 26 Tags
2e3dbdfa9a2012c2decd2edffd1654f26ba1289b
Commit Graph

10913 Commits

Author SHA1 Message Date
Novacat
2e3dbdfa9a Update life.dm 2020-07-30 15:33:47 -04:00
Novacat
057b9fba16 Update life.dm 2020-07-30 15:32:15 -04:00
Atermonera
65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
Novacat
9578296ca5 Merge pull request #8535 from VOREStation/upstream-merge-7352 
[MIRROR] Increase mob default reload time from 1 second to 4 seconds.
 2020-07-30 15:03:12 -04:00
Novacat
216a8d8c12 Merge pull request #8533 from VOREStation/upstream-merge-7345 
[MIRROR] custom_sprites.dm small improvement and better commenting.
 2020-07-30 14:53:48 -04:00
Novacat
38e4cbd3e9 Merge pull request #8532 from Cyantime/patch-2 
Allows some protean ventcrawl accessories
 2020-07-30 14:53:25 -04:00
Atermonera
f63d2c4506 Merge pull request #7352 from lbnesquik/Kot-Mob-Tweak 
Increase mob default reload time from 1 second to 4 seconds.
 2020-07-30 14:46:19 -04:00
Atermonera
cb31910225 Merge pull request #7345 from LunarFleet/Lun-Sprite 
custom_sprites.dm small improvement and better commenting.
 2020-07-30 14:41:39 -04:00
Novacat
c81eae8191 Merge pull request #8531 from lbnesquik/Kot-Stuff-Cyborg 
Add a little message for once you are done refilling some water as a dogborg.
 2020-07-30 14:33:17 -04:00
Cyantime
120483c41c Allows some protean ventcrawl accessories 2020-07-30 14:30:58 -04:00
lbnesquik
e962474fc5 Add a little message for once you are done refilling some water as a dogborg. 2020-07-30 19:41:18 +02:00
Verkister
744fb20b4a Fixes some trait stats requiring set_species 
Moves a couple trait stats applied via set_species proc to somewhere custom species can actually access them.
Mostly just affects motion based hunger factor, and would also affect health traits but those already have their own bandaid application.
 2020-07-30 11:28:02 +03:00
ShadowLarkens
7f2952bd90 Fix medhuds/sechuds and stuff showing on the camera monitor improperly 2020-07-29 19:03:33 -07:00
Rykka
a34bb589d1 Massive Map/Bugfix 2020-07-28 10:33:56 -04:00
Novacat
c4f7aed7f4 Merge pull request #8215 from dwinters99/spellcheck 
Minor typo fixes
 2020-07-27 01:55:24 -04:00
Novacat
5701af8b95 Update medbot.dm 2020-07-26 01:58:53 -04:00
Atermonera
c1638aa7b8 Fix scrubbers 2020-07-26 01:57:38 -04:00
Rykka
84d9798802 Medibot Interaction Hotfix 
Always check that you're passing the arguments a proc needs.

In this case, I was calling interact(), but not giving it a mob to interact with. Whoops.
 2020-07-25 23:09:09 -04:00
ShadowLarkens
2579579fd1 TGUI'ified Medical Everything 
This converts basically every UI used in the Medical department to use
TGUI instead. Fancy!

ParadiseSS13/Paradise#13738
 2020-07-25 00:44:51 -07:00
ShadowLarkens
c2618c0e66 Merge remote-tracking branch 'upstream/master' into tgui_wires 
# Conflicts:
#	code/__defines/misc.dm
 2020-07-24 17:06:18 -07:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Novacat
47b31301e8 Merge pull request #8413 from Rykka-Stormheart/shep-dev-aurora-cooking 
Aurora Cooking Port
 2020-07-23 02:53:46 -04:00
Shadow-Quill
29173ed58a Pressing Q now properly updates borg modules (#7357) 
* Press Q to refresh borg modules

* No usr for you
 2020-07-23 01:40:41 -04:00
Rykka
21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04:00
Rykka
886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora 
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
 2020-07-22 21:34:13 -04:00
Verkister
4430c4eed4 Fixes panther rest icon not being used 2020-07-22 17:01:07 +03:00
cadyn
dc5ddb7d01 Added options to shapeshifter verbs for gradients (#7348) 2020-07-22 06:01:47 -04:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07: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
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