Casey
27b451a2c8
Merge pull request #12353 from GhostActual/Ammo_Boxes
...
Ammo Boxes
2022-03-03 16:22:34 -05:00
VerySoft
2153a45288
Change painting persist decay
...
Instead of paintings lasting 1000 shifts before being deleted
Now the system will store up to 1000 paintings, and remove the one at the top of the list (the earliest/oldest one) first when the maximum number of paintings is exceeded.
Additionally, examining a painting that has been stored will move it to the bottom of the list, effectively renewing its lease in the system.
This should make it so that paintings aren't just arbitrarily being removed for being old, and, the paintings that actually get looked at should stick around.
2022-03-01 20:50:05 -05:00
klaasjared
e4ed93e11d
Shotgun Ammo Boxes
...
Replaces all ammo boxes with new ammo box type (Alt-Click to remove shells) - put in separate Commit in case Admins don't want this
(Compile Fixes)
2022-03-01 01:27:54 -05:00
DESKTOP-4BUBN9N\Mike
cf20e1fe39
I could break the president in two with my bare hands!
2022-02-26 08:56:02 +00:00
Heroman
ae267030eb
Merge branch 'master' into upstream-merge-8222
2022-02-19 18:41:29 +10:00
Casey
1432ca2b22
Merge pull request #12253 from GhostActual/Donk-Co.-Toys
...
Donk Co. Toys
2022-02-18 23:26:48 -05:00
Casey
de8906e315
Merge pull request #12247 from ktccd0/ktccd-dev-Corner-Sofa-Fix
...
Fixes sofa paths
2022-02-18 14:04:56 -05:00
klaasjared
e8e7bf3990
Toy Guns
...
Toy Guns 2
Toy Guns 3
Toy Guns 4
2022-02-17 21:04:03 -05:00
klaasjared
6550b428d2
Base Commit
2022-02-17 00:00:57 -05:00
ktccd0
210ba28c6b
Undoes corp sofa fix
...
This undoes my fix for the corporate sofas specifically. Their object subtyping is awful, but there is enough redundant code in there to make the layers work correctly for them anyway.
2022-02-16 15:07:22 +01:00
ktccd0
618f11ad3e
Fixes sofa paths
...
Sofas used to have really weird subtypes, now they correctly inherit from either the base (middle), left, right, or corner, which solves the issue with layers on the non-red corner sofas (which red sofas were exempt from due to them being the base object type).
2022-02-16 14:48:28 +01:00
klaasjared
58fe8ef497
Base Commit
...
Tresh
2022-02-16 01:50:14 -05:00
Killian
3abb52f578
heavy-duty engi gloves
...
today's word is "funkoscopy"
2022-02-14 13:00:26 +00:00
PastelPrinceDan
ad7a96bfa3
talon mining
2022-02-06 22:51:28 +00:00
Casey
c399a15853
Merge pull request #12151 from PastelPrinceDan/catslugcrate
...
adds a catslug crate to cargo
2022-02-06 09:16:05 -05:00
Casey
77e267a620
Merge pull request #12146 from Hatterhat/formal-in-the-loosest-sense
...
skimpy cap "dress" probably more like a leotard idk
2022-02-06 09:13:56 -05:00
Casey
eeb09d1125
Merge pull request #11763 from KillianKirilenko/kk-talon
...
Talon Improvements, Take 2
2022-02-06 09:06:51 -05:00
PastelPrinceDan
25c1f8ed29
catslug (contained)
2022-02-05 18:33:39 +00:00
Hatterhat
dd3b2bb51d
brought to you by /v/ sings - Bury the Light
2022-02-03 03:35:10 -06:00
Killian
6c960fea54
Merge remote-tracking branch 'upstream/master' into kk-talon
2022-01-17 08:55:24 +00:00
Heroman
c700309efd
Fixes wrench dropping when deconstructing low wall + allows normal climbing
2022-01-16 16:12:14 +10:00
VerySoft
3992250aee
Removes the announcement for main pred and morph spawns
...
The announcement only really encourages people to go hunting for it, and usually not in the good way, which can in general ruin the surprise that these roles can employ.
So! I think it would be better if we just didn't announce them publicly, since they aren't a thing we ever want people to go and respond to mechanically, and, I think that announcements like these ought to be reserved for things we want people responding to.
2022-01-11 12:23:12 -05:00
Heroman
582db5d9d3
Grammar fixes
2021-12-23 16:36:25 +10:00
Heroman
29a0bce573
Fixes g
2021-12-23 16:28:48 +10:00
Heroman
d65d379c4b
Adjusts descriptions and flavor texts of painting frames
2021-12-23 16:23:21 +10:00
Killian
67e159fff2
Update walllocker.dm
2021-12-16 01:52:57 +00:00
Killian
433439c47c
Merge remote-tracking branch 'upstream/master' into kk-talon
2021-12-16 01:51:50 +00:00
Killian
790800e3e2
Update walllocker.dm
2021-12-16 01:34:35 +00:00
Heroman
ad1e439e49
Limits painting name length to 250 characters
2021-12-11 20:59:33 +10:00
Casey
492c12d9ad
Merge pull request #11975 from KillianKirilenko/kk-knockknock
...
Door Interact Tweaks
2021-12-06 05:57:21 -05:00
Killian
290529c202
door interact tweaks
2021-12-05 11:25:20 +00:00
Heroman
796aae194c
Allows simplemobs climb ladders + trash pile interaction fix
2021-12-05 09:36:39 +10:00
VerySoft
2bf704a741
Is it the final one???
2021-12-02 04:05:53 -05:00
VerySoft
d2e0ebe9d6
One more for awooing
2021-12-01 11:10:44 -05:00
Casey
947ad6862e
Merge pull request #11894 from Heroman3003/framefix
...
Fixes some janky frame issues
2021-11-22 23:35:22 -05:00
Heroman
6b168ae5f0
Fixes some janky frame issues
2021-11-22 06:52:33 +10:00
Heroman
f3cbaa4413
Adds leather gloves to (xeno)botanist lockers
2021-11-21 13:50:36 +10:00
Killian
dca7626ac7
Merge remote-tracking branch 'upstream/master' into kk-talon
2021-11-17 20:43:35 +00:00
Killian
cdf61f9b24
Update walllocker.dm
...
adds light sources and kicks CI again
2021-11-17 20:25:17 +00:00
Casey
b8217fb7a8
Merge pull request #11819 from PastelPrinceDan/berets
...
department berets (mostly heads tbh)
2021-11-12 05:27:08 -05:00
PastelPrinceDan
fe20fabd8f
woo yeah woo berets yeaaaah woo!!!!
2021-11-12 09:16:55 +00:00
VerySoft
e9f220f408
Adds catslug to maintpred options
2021-11-11 05:48:28 -05:00
Heroman
1ce9880aeb
Fixes infinite glass from low walls
2021-11-05 15:54:53 +10:00
Killian
fcfa8a56bd
Talon Improvements
2021-11-03 10:58:07 +00:00
Aronai Sieyes
b4ce0442cd
Merge pull request #11722 from KillianKirilenko/kk-misc
...
Hardwood Material Port
2021-10-30 17:25:23 -04:00
Killian
70b88ad181
hardwood material port
2021-10-28 10:21:38 +01: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
5d3de0b351
Merge pull request #11653 from VOREStation/upstream-merge-8313
...
[MIRROR] Fixes displaced steel displaced
2021-10-27 11:28:03 -04:00
Aronai Sieyes
6a46891e93
Merge pull request #11544 from VOREStation/upstream-merge-8230
...
[MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
2021-10-22 14:23:22 -04:00
Ghost Actual
60e1abe927
Misc additions I made while sleep deprived ( #11535 )
...
* Base Commit
* Small Fix
* Small Fix
* Small Fix
2021-10-22 13:49:13 -04:00
