Commit Graph

9053 Commits

Author SHA1 Message Date
DeltaFire
a390816092 Merge pull request #13888 from Citadel-Station-13/silicons-patch-48
adds vv wrapper for snowflake plushies
2020-12-28 17:42:26 +01:00
DeltaFire
9b6d4c1371 Merge pull request #13889 from Citadel-Station-13/silicons-patch-49
adds recursive pulling check to space transitions
2020-12-28 17:39:59 +01:00
DeltaFire
8843a830d2 Merge pull request #13897 from keronshb/energybolafix
Fixess Energy Bola to be catchable
2020-12-28 17:08:29 +01:00
keronshb
365abe1c5a Allows Energy Bola to be catchable
Allows Energy Bola to be catchable
2020-12-27 17:15:59 -05:00
silicons
5e269c327a Update space.dm 2020-12-27 10:53:11 -07:00
silicons
d4f94724ec Update plushes.dm 2020-12-27 10:51:44 -07:00
silicons
798b1b50f4 Update plushes.dm 2020-12-27 10:38:07 -07:00
Lin
b0b483105a Merge pull request #13857 from silicons/contractor_fix_for_real
fixes contractor pods this time for real (and 25% tested instead of 0%)
2020-12-26 23:52:51 +00:00
silicons
6c7b2386d8 Merge pull request #13850 from DeltaFire15/welder-autorefuel-fix
Fixes self-refueling welders
2020-12-25 10:28:59 -07:00
DeltaFire
146135f059 Merge pull request #13836 from silicons/statpanel
refactors statpanel a bit to send topics to client instead of item which bypasses problematic /Topic overrides entirely
2020-12-24 18:29:33 +01:00
silicons
bff30f587b sigh 2020-12-23 09:16:16 -07:00
DeltaFire
7da2f871d0 corrects comment 2020-12-23 03:02:42 +01:00
DeltaFire
8a5cdddb67 actually increases brass welder refueling speed 2020-12-23 02:57:01 +01:00
DeltaFire
4d4d0e9ec3 a fix fix 2020-12-23 02:50:15 +01:00
silicons
2faf0d3fd1 ok 2020-12-22 13:42:03 -07:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
silicons
c58a32b9c5 Merge pull request #13820 from DeltaFire15/temp-reebe-removal
[TESTMERGE ONLY] Temporarily disables Reebe
2020-12-22 09:35:47 -07:00
DeltaFire
7a9e3fcb40 Merge pull request #13825 from raspy-on-osu/screw-windoors
Windoors stay open longer
2020-12-22 16:16:08 +01:00
DeltaFire
bdbe1bc404 Merge pull request #13829 from silicons/keyloop
Bandaid fix for input controller lockup due to sleeping
2020-12-22 06:00:29 +01:00
silicons
000e525157 ok 2020-12-21 21:11:54 -07:00
silicons
901fcddf44 Merge pull request #13819 from Hatterhat/surv-dag-buf
survival dagger light fix + butchery buff
2020-12-21 10:30:13 -07:00
silicons
0e7a597a2b alright 2020-12-21 10:27:28 -07:00
raspy-on-osu
d3e224d9c1 init 2020-12-21 04:54:19 -05:00
DeltaFire
8414db5add Merge pull request #13814 from Xantholne/TwinSwordSheath
Fixes twin sword sheaths icon/item state from being blank sprites
2020-12-21 02:20:32 +01:00
Xantholne
1c968e6ebe period equals 2020-12-20 16:00:18 -07:00
silicons
db6f9349c5 Merge pull request #13785 from Putnam3145/fix-grab-bag
Makes grab bag ONLY make station antags; triples alien dynamic threat.
2020-12-20 15:42:04 -07:00
Lin
36a94c97e0 Merge pull request #13802 from Citadel-Station-13/silicons-patch-29
bandaid fixes meteors not spawning properly due to off by 1 error with zlevel transition
2020-12-20 18:27:47 +00:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
silicons
11aad4e6db Merge pull request #13801 from SandPoot/master
Makes limb grower better
2020-12-20 10:34:21 -07:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
Putnam
f9edd8e8ac Made the previous-round weight-adjust based on max instead of average. 2020-12-19 20:34:28 -08:00
Putnam
a3f2ae3333 i'm such an idiot. 2020-12-19 20:27:07 -08:00
Putnam
c47761fa58 Added a DYNAMIC_THREAT_BASELINE config option.
why didn't i do this sooner
2020-12-19 19:30:16 -08:00
Putnam
f840965763 no autotraitor, better logging 2020-12-19 18:04:22 -08:00
DeltaFire
7d4de6b8d0 screamies 2020-12-20 02:32:59 +01:00
Hatterhat
fa799a0ac5 it compiles 2020-12-19 19:02:56 -06:00
Hatterhat
b8b2f34735 funny knife 2020-12-19 18:45:25 -06:00
Putnam
fb31117a8d nah nah none of that. 2020-12-18 22:36:41 -08:00
Xantholne
a5c14b90c5 Adds missing sheathing sounds 2020-12-18 22:56:30 -07:00
Xantholne
d60d72c7b7 Fixes twin belts
gives item state and icon state to be functional
2020-12-18 22:03:24 -07:00
Putnam
5e8f76792e Readjusted weight; added min/max config options 2020-12-18 20:24:30 -08:00
Putnam
dd61efbc60 Made dynamic respect midround antag setting (HOW) 2020-12-17 23:29:25 -08:00
Putnam
d47dcc941c Polycircuit sanity checking 2020-12-17 22:54:52 -08:00
Putnam
6f0075e606 Made minor roundstarts actually work. 2020-12-17 22:44:35 -08:00
silicons
ebd6e0cbec no backapck in backpack 2020-12-17 04:14:04 -07:00
silicons
50eee24a4a Update meteors.dm 2020-12-16 18:22:49 -07:00
SandPoot
3ea756a062 typo and remove badword 2020-12-16 11:43:40 -03:00
SandPoot
a0ae0c37fe upload files 2020-12-16 11:39:50 -03:00
Putnam
bdd5fc777f Added an indicator of how many iterations were done. 2020-12-15 19:14:15 -08:00
keronshb
3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00