silicons
|
d6d753e9f7
|
Merge pull request #13959 from necromanceranne/bokken_fixes
Bokken Fixes: You can make them now. Nyoops.
|
2021-01-03 21:37:33 -07:00 |
|
necromanceranne
|
0fda694a52
|
A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused.
|
2021-01-04 15:30:28 +11:00 |
|
silicons
|
a0d58cd18d
|
Merge pull request #13954 from EmeraldSundisk/coglocks
Cog and firelocks.
|
2021-01-03 20:19:46 -07:00 |
|
silicons
|
4c6cc24343
|
Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
|
2021-01-03 18:18:29 -07:00 |
|
silicons
|
0581748282
|
Merge pull request #13942 from YakumoChen/power-sink
#13925 but doesn't underestimate engineering autism
|
2021-01-03 18:09:38 -07:00 |
|
silicons
|
697619856c
|
Merge pull request #13859 from timothyteakettle/unlockable-loadout-items
unlockable loadout items
|
2021-01-03 18:07:18 -07:00 |
|
Lin
|
b3c1c69861
|
Merge pull request #13944 from Citadel-Station-13/silicons-patch-59
fixes matrix labels on colormates (swapped 1 and 2, rg is actually gr)
|
2021-01-02 16:17:24 +00:00 |
|
EmeraldSundisk
|
291c0a0a22
|
Update Space_Station_13_areas.dm
|
2021-01-01 22:46:36 -08:00 |
|
Timothy Teakettle
|
813e0f4c79
|
Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items
|
2021-01-01 22:30:04 +00:00 |
|
necromanceranne
|
6a247e2a68
|
Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites
|
2021-01-02 04:26:39 +11:00 |
|
DeltaFire
|
a2bb761bee
|
Merge pull request #13924 from SandPoot/master
Allows mass sticking money into your id
|
2021-01-01 08:15:53 +01:00 |
|
silicons
|
fbb2cfbba1
|
Update colormate.dm
|
2020-12-31 23:05:14 -07:00 |
|
YakumoChen
|
9325daa743
|
Update powersink.dm
|
2021-01-01 03:35:54 +00:00 |
|
silicons
|
f1205efa0f
|
Merge pull request #13885 from raspy-on-osu/spaceheater-buff
Makes space heaters worth using
|
2020-12-31 12:38:07 -07:00 |
|
necromanceranne
|
0aa5338f9b
|
Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays
|
2021-01-01 05:42:28 +11:00 |
|
SandPoot
|
1fa828a3f7
|
upload files
|
2020-12-30 13:57:10 -03:00 |
|
EmeraldSundisk
|
b1f76a8566
|
Update Space_Station_13_areas.dm
|
2020-12-29 11:38:07 -08:00 |
|
EmeraldSundisk
|
0707f6ecfc
|
Update Space_Station_13_areas.dm
|
2020-12-29 10:56:58 -08:00 |
|
EmeraldSundisk
|
6af5d180d0
|
Update Space_Station_13_areas.dm
|
2020-12-29 10:29:28 -08:00 |
|
silicons
|
da25c48b2c
|
Merge pull request #13855 from Chiirno/paramedBoxOffice
Paramed office on box + Surgery remodel
|
2020-12-29 01:27:49 -07:00 |
|
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 |
|
raspy-on-osu
|
2352580b41
|
init
|
2020-12-27 05:36:49 -05: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 |
|
Timothy Teakettle
|
c3e9cdd9a5
|
finale
|
2020-12-26 23:09:19 +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 |
|
Chiirno
|
35896e92ec
|
Paramedic office added and operating room remodeled
|
2020-12-22 21:50:22 -04: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 |
|