DeltaFire
|
3f736aaa36
|
Merge pull request #13834 from zeroisthebiggay/pogbox
ports the traitor assistant POGBOX that scales damage with tc from /TG/
|
2021-01-06 19:29:17 +01: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 |
|
zeroisthebiggay
|
b20607cb1a
|
Update toolbox.dm
|
2021-01-03 20:18:55 -05: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 |
|
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 |
|
YakumoChen
|
9325daa743
|
Update powersink.dm
|
2021-01-01 03:35:54 +00: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 |
|
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
|
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
|
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 |
|
Timothy Teakettle
|
c3e9cdd9a5
|
finale
|
2020-12-26 23:09:19 +00:00 |
|
zeroisthebiggay
|
3f36b95f92
|
a
a
|
2020-12-23 09:42:10 -05: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 |
|
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 |
|
zerothebigboy
|
dcecd6f03a
|
pogbox
|
2020-12-21 18:28:52 -05:00 |
|
zerothebigboy
|
cca8dc3a36
|
pogbox
|
2020-12-21 18:25:33 -05: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 |
|
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 |
|
Lin
|
3ad777f8f7
|
Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
|
2020-12-20 18:14:48 +00:00 |
|
silicons
|
34f6697e81
|
Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
|
2020-12-20 09:23:20 -07: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 |
|
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
|
d47dcc941c
|
Polycircuit sanity checking
|
2020-12-17 22:54:52 -08:00 |
|
keronshb
|
3d7c896100
|
Scarp Changes and Bundle
This should really fix it now.
|
2020-12-15 20:10:21 -05:00 |
|
MrJWhit
|
f5b99b83f8
|
Fully functional
|
2020-12-13 02:29:29 -05:00 |
|
silicons
|
c70d7a24e0
|
fixes
|
2020-12-11 05:14:38 -07:00 |
|
silicons
|
13391d2af6
|
fix
|
2020-12-11 05:09:29 -07:00 |
|
silicons
|
8d398b3e24
|
Merge pull request #13719 from shellspeed1/Adds-construction-bags-from-tg
Ports construction bags and makes it easier to get material bags. (READY)
|
2020-12-03 16:33:47 -07:00 |
|
shellspeed1
|
3735efbfca
|
Ports construction bags
|
2020-11-29 18:29:03 -08:00 |
|
silicons
|
75d807df4e
|
Merge pull request #13694 from TheObserver-sys/PublicMiningRevival
Local Assistant man can now bash rock again!*
|
2020-11-21 18:25:13 -07:00 |
|
silicons
|
f8d43b7544
|
Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
|
2020-11-18 22:54:51 -07:00 |
|
Putnam3145
|
9d300ade35
|
Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
|
2020-11-18 17:50:38 -08:00 |
|
The0bserver
|
6d1ace27f7
|
Initial Commit: Mapping is painful
|
2020-11-18 00:38:35 -05:00 |
|
silicons
|
891d4ec76e
|
Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
Fixes a bunch of supplypod related stuff
|
2020-11-17 01:12:56 -07:00 |
|
silicons
|
f11b636727
|
Merge pull request #13674 from DeltaFire15/vtec-fixing
The borg VTEC ability no longer persists after the upgrade is removed
|
2020-11-17 01:10:53 -07:00 |
|
silicons
|
a950bcb0fb
|
Merge pull request #13644 from DeltaFire15/hybrid-limbs-wound-stuff
[READY] Hybrid bodyparts - wound surgery edition
|
2020-11-17 01:09:47 -07:00 |
|
DeltaFire
|
44a49a7261
|
Merge remote-tracking branch 'upstream/master' into vtec-fixing
|
2020-11-16 04:30:45 +01:00 |
|
DeltaFire
|
8f04d7f0d1
|
Merge remote-tracking branch 'upstream/master' into system-corruption
|
2020-11-16 04:29:59 +01:00 |
|