Commit Graph
9073 Commits
Author SHA1 Message Date
siliconsandGitHub 407b1fe071 Update humans.dm 2021-01-07 23:14:59 -07:00
silicons 78322199e3 fix 2021-01-01 00:38:46 -08:00
silicons 34256a61ef remove drips 2020-12-30 21:06:34 -08:00
silicons e6000ceffa meme 2020-12-29 11:12:06 -08:00
DeltaFireandGitHub 46a0c65e46 Merge branch 'master' into debris 2020-12-28 19:04:22 +01:00
DeltaFireandGitHub 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
DeltaFireandGitHub 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
DeltaFireandGitHub 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
siliconsandGitHub 5e269c327a Update space.dm 2020-12-27 10:53:11 -07:00
siliconsandGitHub d4f94724ec Update plushes.dm 2020-12-27 10:51:44 -07:00
siliconsandGitHub 798b1b50f4 Update plushes.dm 2020-12-27 10:38:07 -07:00
silicons 57d85f7e86 okay 2020-12-27 05:20:29 -08:00
silicons a42fa987ba ok 2020-12-26 22:43:25 -08:00
silicons 5266ae1437 okay 2020-12-26 22:28:41 -08:00
silicons a6ae0fe5c2 ok 2020-12-26 20:56:48 -08:00
silicons bfb3d087c3 ok 2020-12-26 20:50:28 -08:00
silicons d3414a4d23 ok 2020-12-26 20:47:50 -08:00
silicons dafc6bf89f fix 2020-12-26 20:41:21 -08:00
silicons 3228435237 errors 2020-12-26 20:33:16 -08:00
silicons 6044086de0 changes 2020-12-26 20:29:52 -08:00
silicons b7cd14b41e poggy? 2020-12-26 20:09:24 -08:00
LinandGitHub 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 9f130e0c5a blood 2020-12-26 14:09:10 -08:00
silicons 5c0b4f824f hoh boy 2020-12-26 12:42:03 -08:00
silicons 45af2360ad changes 2020-12-26 11:35:47 -08:00
silicons 5cf717e75d self message 2020-12-25 16:10:32 -08:00
silicons 5e66e4509f wew 2020-12-25 16:07:17 -08:00
siliconsandGitHub 6c7b2386d8 Merge pull request #13850 from DeltaFire15/welder-autorefuel-fix
Fixes self-refueling welders
2020-12-25 10:28:59 -07:00
DeltaFireandGitHub 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
DeltaFireandGitHub 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
siliconsandGitHub c58a32b9c5 Merge pull request #13820 from DeltaFire15/temp-reebe-removal
[TESTMERGE ONLY] Temporarily disables Reebe
2020-12-22 09:35:47 -07:00
DeltaFireandGitHub 7a9e3fcb40 Merge pull request #13825 from raspy-on-osu/screw-windoors
Windoors stay open longer
2020-12-22 16:16:08 +01:00
DeltaFireandGitHub 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
siliconsandGitHub 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
DeltaFireandGitHub 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
siliconsandGitHub 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
LinandGitHub 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
LinandGitHub 3ad777f8f7 Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
siliconsandGitHub 11aad4e6db Merge pull request #13801 from SandPoot/master
Makes limb grower better
2020-12-20 10:34:21 -07:00
siliconsandGitHub 34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00