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
SatinIsle
367e5a27bc
Added 4 admin duckies
...
Added four new admin spawn rubber duckies with unique abilities.
Red Ducky: Plays the adminhelp sound, after a few uses, it explodes.
Blue Ducky: Spawns lube on the floor where you are standing.
White Ducky: Hits you with (fake) lightning.
Black Ducky: Literally just an anti-photon grenade, but it quacks.
2024-01-30 01:56:10 +00: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
Izac Joof Forsgren and GitHub
bac02656da
Merge branch 'master' into uppstream-update
2024-01-22 06:35:01 +01:00
izac112
1c2d4da6bd
Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update
2024-01-22 05:18:14 +01:00
izac112
43aa56993b
Bumps advanced roller beds surgery odds to 75%
2024-01-21 18:45:50 +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
quackjack
92990cca0f
Small adds + legtrap implemenatation
2024-01-14 17:08:24 -05:00
Heroman3003 and GitHub
cc48404f9c
Merge pull request #15671 from Very-Soft/spider
...
Spider
2024-01-14 07:07:20 +10:00
VerySoft
9a383923e1
Put nurse back into the /varied spiderling type
2024-01-09 16:08:17 -05: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
Heroman3003 and GitHub
46f5717705
Merge pull request #15645 from Rick4242/map-stuff
...
Better Snowy Redgates!
2023-12-31 20:04:26 +10:00
Kashargul and GitHub
cf8d3dde40
we can't quite listen in without the encryption allowed
2023-12-31 08:46:43 +01:00
izac112
2fdeac8c38
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2023-12-28 09:22:14 +01:00
Rick4242
cd3f6ea342
Better Snowy Maps!
...
Modifies the eggnog town and hotspring redgates to add some likely needed elements and changes, and overall more detail.
2023-12-26 22:27:14 -06:00
Repede
5e525005e4
Puts RSF back to virgo code (removes whatever we did before)
2023-12-24 01:28:21 -05:00
Heroman3003 and GitHub
0562ab1bac
Merge pull request #15633 from Kashargul/furtherPullingFixes
...
further teleport pulling fixes
2023-12-22 04:48:46 +10:00
Kashargul and GitHub
9b864c0f54
further pulling fixes
2023-12-21 09:41:32 +01:00
SatinIsle
51d46b2a51
Energy drinks
...
Added a set of new Nukie energy drinks, each with their own reagent that causes jitters after 30u.
Also added a Nukie vending machine to find these drinks in!
2023-12-18 16:34:50 +00:00
izac112
eddb283c11
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2023-12-18 03:17:20 +01:00
Kashargul and GitHub
727ed8f024
continue pulling on map edges / map portals
2023-12-17 01:03:43 +01:00
izac112
bd02ad4b78
Updates readme and fixes books slightly
2023-12-15 09:11:56 +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
BlackMajor and GitHub
b5a7cf59ea
Update items.dm
2023-12-09 01:05:06 +13:00
Kashargul and GitHub
f48fa66cca
robots can use melee weapon range
...
runtime fix in window.dm
2023-12-07 23:25:11 +01:00
Heroman3003 and GitHub
22221abc31
Merge pull request #15557 from Heroman3003/poster-remove
...
Removes a few posters
2023-12-03 11:17:38 +10:00
Heroman
8f1979207a
Removes a few posters
2023-12-03 11:10:29 +10: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