cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 02:13:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,448 Commits 8 Branches 26 Tags
9db5968f3edab4e4f5ff79da4dff9627065bae89
Commit Graph

28345 Commits

Author SHA1 Message Date
Heroman
9db5968f3e Adjustments to mob falling mechanics 2021-11-03 06:47:55 +10:00
Casey
993ef17a4a Merge pull request #11746 from Very-Soft/holodeck!!! 
Holodeck update and map tweaks
 2021-11-01 18:02:12 -04:00
VerySoft
375ec20f90 Holodeck update and map tweaks 
3 new holodeck programs, a gym, a game room, and a medical patient ward

Also add some more lights to the showers after the previous change.
 2021-11-01 17:52:20 -04:00
Heroman
4b38fb9034 Modularizes SD files a bit 2021-10-31 08:42:18 +10:00
Aronai Sieyes
b4ce0442cd Merge pull request #11722 from KillianKirilenko/kk-misc 
Hardwood Material Port
 2021-10-30 17:25:23 -04:00
Casey
55ee669869 Merge pull request #11710 from Very-Soft/SDremaster 
Stellar Delight!
 2021-10-30 09:33:21 -04:00
VerySoft
ac5c75d83a Requested changes 2021-10-29 23:36:25 -04:00
VerySoft
f2164827b4 The final updates 
Adds a new random spawner for coins with a fail chance (so the coins aren't always in the same place)

Addsome missing vending machines to the random vending machine spawner 

Adds a sound to starting and stopping in ships (that only plays at most once every 10 seconds.)

And sets it up so that planets and ships can have a sound when visited.

A bunch of little map tweaks to polish things up!
 2021-10-29 02:29:42 -04:00
Killian
70b88ad181 hardwood material port 2021-10-28 10:21:38 +01:00
Aronai Sieyes
fba0e4dc0c Merge pull request #11720 from VOREStation/Arokha/verupdate 
Update version guidance
 2021-10-27 21:46:36 -04:00
Aronai Sieyes
1f19a637e5 Update version guidance 2021-10-27 21:32:12 -04:00
Aronai Sieyes
a9ef29776c Merge pull request #11681 from VOREStation/upstream-merge-8326 
[MIRROR] You can't feed drinks to borgs
 2021-10-27 21:24:45 -04:00
Aronai Sieyes
46d68d370c Merge pull request #11717 from VOREStation/Arokha/unused 
Unused var fix
 2021-10-27 21:22:32 -04:00
Aronai Sieyes
e5346a3920 Merge pull request #11675 from VOREStation/upstream-merge-8250 
[MIRROR] Adds unique projectile hit messages to simplemobs
 2021-10-27 21:06:41 -04:00
Aronai Sieyes
7f3eb7ecee Merge pull request #11669 from VOREStation/upstream-merge-8331 
[MIRROR] Rum and Cola fix
 2021-10-27 20:58:26 -04:00
atermonera
bdf63a9d4b Adds can_feed proc 2021-10-27 20:58:13 -04:00
Cerebulon
5d86e5051c Adds unique projectile hit messages to simplemobs (#8250) 
* Adds unique hit messages to simplemobs

* decl'd hit lists

* how was that even working

* set decl ref on init
 2021-10-27 20:52:55 -04:00
Schnayy
c08df74d82 fixes some drinks 2021-10-27 20:44:43 -04:00
Aronai Sieyes
76408996f7 Unused var fix 2021-10-27 20:39:10 -04:00
Aronai Sieyes
e1068faac0 Rebase 2021-10-27 20:37:02 -04:00
MistakeNot4892
0cea9c35a6 Remove suicide act 2021-10-27 20:35:12 -04:00
VerySoft
4b4d21534e Docking code change 
Don't set docking codes if docking codes are already set
 2021-10-27 19:52:57 -04:00
VerySoft
9a3e1cca1e Updates Aurora event 
Adds attribution for the song that plays, makes the song louder, and shortens the AI voice messages relating to the event because dayum
 2021-10-27 19:52:39 -04:00
VerySoft
a4cdc80f8c Stellar delight map files 
Files for the stellar delight to work probably
there are also some edits to tether and other misc files for the purpose of making things work with multiple maps
CREMATORIUM NO GET TAG
 2021-10-27 19:52:39 -04:00
Casey
a027154001 Merge pull request #11665 from Hatterhat/brrrrped 
the part printing buff nobody asked for
 2021-10-27 17:55:11 -04:00
Hatterhat
2897b47a11 Merge branch 'master' of https://github.com/VOREStation/VOREStation into brrrrped 2021-10-27 16:43:45 -05:00
klaasjared
56f4ab1b4c Base Commit 2021-10-27 16:18:30 -04:00
Aronai Sieyes
3b5fb11bd1 Merge pull request #11663 from KillianKirilenko/kk-arfg 
[WIP] Atmospheric Retention Fields
 2021-10-27 14:38:56 -04:00
Aronai Sieyes
a826bcd330 Merge pull request #11712 from KillianKirilenko/kk-misc2 
Customverb tweak
 2021-10-27 14:17:35 -04:00
PastelPrinceDan
86627bfa9c no conflicts this time please, 2021-10-27 18:27:30 +01:00
Casey
957bc91e5d Merge pull request #11707 from Hatterhat/violence 
adds an intent check for the head-targetting pinning message
 2021-10-27 13:05:31 -04:00
Hatterhat
2e1b6b3406 THE webedit 2021-10-27 11:47:35 -05:00
Casey
bb830284f5 Merge pull request #11711 from GhostActual/eye_see_you 
Eye See You
 2021-10-27 12:11:39 -04:00
Casey
2f4cdeeabe Merge pull request #11709 from Very-Soft/shademaneyes 
Shadekin eye tweak
 2021-10-27 12:10:42 -04:00
Casey
ffabce25b5 Merge pull request #11708 from Hatterhat/drill-buffs 
wacky haphazardly barely thought through standing drill buffs
 2021-10-27 12:10:19 -04:00
Casey
a84241208d Merge pull request #11706 from GhostActual/dodgeball 
Dodgeball+
 2021-10-27 12:05:45 -04:00
Casey
72a0e86484 Merge pull request #11705 from GhostActual/brainfood 
Brainfood
 2021-10-27 12:05:14 -04:00
Casey
226802ff73 Merge pull request #11701 from Hatterhat/tg-ka 
ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs
 2021-10-27 12:00:42 -04:00
Casey
18fa28a431 Merge pull request #11698 from GhostActual/toolz 
Tool Time (Fixed)
 2021-10-27 11:59:04 -04:00
Casey
2840460a81 Merge pull request #11695 from Verkister/patch-95 
Caps item egg size to 100%
 2021-10-27 11:48:29 -04:00
Casey
739998e50b Merge pull request #11686 from Very-Soft/hairbs 
Make hairs not be offset when using big ears!
 2021-10-27 11:45:08 -04:00
Casey
4fa0418e9a Merge pull request #11680 from Heroman3003/stair-sy 
Should fix pull stair
 2021-10-27 11:41:52 -04:00
Casey
10798ace4c Merge pull request #11673 from PastelPrinceDan/salt 
removes 'empty ore box' verb because i'm done with crashes
 2021-10-27 11:39:41 -04:00
Casey
e9050833ee Merge pull request #11672 from Verkister/patch-93 
Makes trash a valid borg fuel again
 2021-10-27 11:39:02 -04:00
Casey
9156979a57 Merge pull request #11671 from VOREStation/upstream-merge-8328 
[MIRROR] Rocket launchers make the projectile when they consume the rocket
 2021-10-27 11:38:20 -04:00
Casey
7dc1c290c0 Merge pull request #11670 from VOREStation/upstream-merge-8329 
[MIRROR] Unequipping mask slot won't disable internals when wearing airtight hats
 2021-10-27 11:37:40 -04:00
Casey
d27e53a384 Merge pull request #11664 from Verkister/patch-91 
Small organ digestion tweak
 2021-10-27 11:32:59 -04:00
Casey
d4da529c2d Merge pull request #11662 from Verkister/patch-90 
Fixes taur riding offsets for resize mechanics
 2021-10-27 11:32:28 -04:00
Casey
d77990cf41 Merge pull request #11658 from KillianKirilenko/kk-traffic 
Traffic Refinements
 2021-10-27 11:30:46 -04:00
Casey
648823922e Merge pull request #11657 from VOREStation/upstream-merge-8315 
[MIRROR] Rootspeak isn't a RESTRICTED language
 2021-10-27 11:28:59 -04:00