izac112
153c3abf2e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-26 03:37:23 +01:00
izac112
578e38108f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-25 19:31:25 +01:00
Drathek and GitHub
7c8bb85de3
Whitespace Standardization [MDB IGNORE] ( #15748 )
...
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.
* Attempt to normalize example.yml (and another file I guess)
* Try again
2024-02-20 11:28:51 +01:00
izac112
19e46d19b2
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-17 01:06:24 +01:00
Kashargul and GitHub
59d751a9f9
Round value adjustments for react ( #15764 )
...
* input adjustments
* .
* .
2024-02-16 14:18:54 +01:00
Heroman3003 and GitHub
cc7bf56ae5
Merge pull request #15744 from VOREStation/cleaned-defines
...
Cleaning up some defines
2024-02-12 06:12:25 +10:00
Heroman
55fe8e1657
Adds the Short Stacker
2024-02-11 19:08:49 +10:00
Selis
d99321bfdf
Cleaning up defines
2024-02-10 16:44:44 +01:00
izac112
9402b12322
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-08 18:19:52 +01:00
Kashargul and GitHub
691c3ca75f
porting healthbars from RS + mat fixes
2024-01-29 00:00:25 +01:00
Kashargul and GitHub
d3b0c1ebe6
robot upgrade overhaul
2024-01-27 13:29:19 +01:00
izac112
1c2d4da6bd
Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update
2024-01-22 05:18:14 +01:00
Kashargul
1444a224a3
missed tags
2024-01-21 12:44:12 +01:00
Kashargul
e4b62dfa35
remove static chat colour tags
2024-01-21 12:34:53 +01:00
Heroman3003 and GitHub
cd6823c7e0
Merge pull request #15689 from Darlantanis/krakenmynemesis
...
Many bug fixes, QoL, and PDA notes port (now with sensible diffs)
2024-01-19 14:53:19 +10:00
Nadyr and GitHub
9347a99f5b
Ports QoL, upgrades, and a lot of bug fixes
2024-01-18 21:04:36 -05:00
Repede
734ead1be6
Ready to review version
2024-01-18 18:37:54 -05:00
Kashargul and GitHub
98b8589181
fix runtime and dupe
2024-01-18 23:58:59 +01:00
Repede
29fd7df39f
Draft
2024-01-18 00:47:56 -05:00
7e33bd1d78
Update code/game/objects/items/weapons/traps.dm
...
Co-authored-by: Izac Joof Forsgren <izac10@live.com >
2024-01-15 13:25:36 -05:00
quackjack
c985b5e1fd
Fin
2024-01-14 22:38:14 -05:00
Heroman3003 and GitHub
cc48404f9c
Merge pull request #15671 from Very-Soft/spider
...
Spider
2024-01-14 07:07:20 +10:00
VerySoft
c32d33fad9
Spider
...
Makes it so that nurse spiders can't spawn from any random sources, such as spider egg clusters, spider spawners, and capture crystals.
GMs and map makers can still put nurse spiders out if they want to, but this should stop any UNEXPECTED nurse spiders from appearing, and stop spiders from snowballing quite so hard when the conditions are right.
2024-01-09 14:59:42 -05:00
Eli
4d61d0d1e7
SleeveMate Emag action
2024-01-08 18:51:41 +11:00
izac112
c8a8aa3c12
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-01-01 20:28:55 +01:00
Kashargul and GitHub
cf8d3dde40
we can't quite listen in without the encryption allowed
2023-12-31 08:46:43 +01:00
Repede
5e525005e4
Puts RSF back to virgo code (removes whatever we did before)
2023-12-24 01:28:21 -05:00
izac112
eddb283c11
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2023-12-18 03:17:20 +01:00
izac112
bd02ad4b78
Updates readme and fixes books slightly
2023-12-15 09:11:56 +01:00
Selis and GitHub
7ccdbb258f
Revert "Revert "12/10/23 - Map swap update" ( #15593 )" ( #15594 )
...
This reverts commit f00d13da66 .
2023-12-11 00:22:42 +01:00
Selis and GitHub
f00d13da66
Revert "12/10/23 - Map swap update" ( #15593 )
2023-12-10 23:37:45 +01:00
Heroman3003 and GitHub
0c18a049a6
Makes gift wrap display its warnings better ( #15584 )
2023-12-09 21:58:12 +01:00
Kashargul and GitHub
8f1df9b616
pry was missing for firedoors
2023-12-09 05:40:18 +01:00
Heroman3003 and GitHub
f1f764f36f
Merge pull request #15545 from KillianKirilenko/kk-mini1
...
Protean Reconstitutor
2023-12-03 11:08:56 +10:00
Heroman3003 and GitHub
864248da9b
Merge pull request #15424 from KillianKirilenko/kk-laserdome
...
Redgate Laserdome
2023-12-03 11:07:22 +10:00
Killian
ce93d40c1c
protean reconstitutor
...
construction, components, and upgrades
2023-12-01 10:54:19 +00:00
izac112
5052f6f672
Merge branch 'release' of https://github.com/VOREStation/VOREStation ; branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac
2023-11-28 16:48:53 +01:00
Heroman3003 and GitHub
500fc95e84
Adds altevian cake slice ( #15525 )
2023-11-19 00:29:47 +01:00
Heroman3003 and GitHub
9e7fe393be
Merge pull request #15524 from Kashargul/VorebellyRobotOverlayFixes
...
Vorebelly robot overlay fixes + VTEC toggle
2023-11-18 05:05:50 +10:00
Kashargul and GitHub
7b17325809
Vorepanel fixes + VTEC toggle
...
fixed typo in the vorepanel tgui, resulting in Item Vorebelly Size Mult: not being changebale
fixed a wrong variable use which led to broken sprites in case the Mob Vorebelly Size Mult: was tset to 0.
added VTEC toggle.
2023-11-17 19:46:13 +01:00
Kashargul and GitHub
d6b2f4c3dd
Added a module to allow medihounds and securityhounds to ingest items upon installation. Does not interfer with the maximum 1 person limit. Allows a maximum of 4 items to be ingested with both modules (capability and capacity) insalled.
2023-11-10 20:10:52 +01:00
Heroman
cbd0307a0c
Fixes some syndie borg items
2023-11-03 11:59:12 +10:00
Heroman
cb9f552988
Adds confetti gun (unused for now)
2023-11-03 06:58:13 +10:00
SatinIsle
6e848bea8b
Desatti vending machine
...
Added a vending machine that stocks all desatti foods. Included in random vending machine choices.
Added rhubarb and custard sweets.
Added pork pies.
Added a sweets crate to cargo hospitality orders.
Fixed desatti jaffa cake crate having only one box instead of ten.
2023-10-30 17:27:56 +00:00
izac112
a17d96cb92
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-10-30 11:24:00 +01:00
SatinIsle
5e3f8677a5
Desatti Catering
...
Added a bunch of british snacks! Wine gums, pasties, sherbet saucers, custard creams, bourbon biscuits, sausage rolls, scotch eggs and 'shrimps and bananas'.
There is no normal way to obtain these right now, and I will add one soon. But for now I had to get them off my PC to be safe as I am moving my repository.
2023-10-27 19:48:49 +01:00
Heroman3003 and GitHub
aa29834f8d
Merge pull request #15434 from Enzo-Leon/altevian
...
Altevian Adjustments - Descriptions & Small Tweaks
2023-10-05 06:07:48 +10:00
Enzo-Leon
f5cc531bb9
Feedback adjustments for improved sentence structue.
2023-10-02 12:27:31 -07:00
Enzo-Leon
f13f395db7
Altevian Adjustments - Descriptions & Small Tweaks
2023-10-02 11:40:19 -07:00
Heroman
b255b1a8a3
Fixes belts and pouches not being able to hold power tools
2023-10-02 15:54:41 +10:00