b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
341c2130be
Renamable.
2022-05-17 14:47:16 +01:00
cf1a7e648a
Update anvil.dm
2022-05-16 23:33:33 +01:00
12c5352383
Update anvil.dm
2022-05-16 23:20:20 +01:00
f3de0f8c54
Update anvil.dm
2022-05-16 21:16:56 +01:00
f3aa2f996e
Update anvil.dm
2022-05-16 16:47:01 +01:00
4d65618de7
Update anvil.dm
2022-05-16 16:45:24 +01:00
3cf3e4ff74
Create anvil.dm
2022-05-16 16:40:21 +01:00
fed19eee02
Update anvil.dm
2022-05-16 16:37:05 +01:00
98416ce138
Update anvil.dm
2022-05-16 16:24:22 +01:00
0eb0a27826
Update anvil.dm
2022-05-16 16:08:51 +01:00
ebcd24e2a1
Update anvil.dm
2022-05-16 14:46:27 +01:00
a3e08b5fd2
Weh! Anvil level up reworks
2022-05-16 14:23:59 +01:00
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
704fc75a92
Update anvil.dm
2021-12-03 10:56:09 +02:00
3729707f45
Update anvil.dm
2021-12-03 10:37:19 +02:00
721c189579
Update anvil.dm
2021-12-03 10:15:58 +02:00
79fd76007b
Stundildo recipe added to anvil
2021-12-03 09:56:09 +02:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
4b13d1772c
[Ready] Bone Anvil and processable Bone ingots ( #15290 )
...
* Adding all the extra stuff
* whoops, slipped my last fix in here.
* bone balance
* 6 Goliaths + 3 Watchers + 1 Legion
* bumps the damage modifier down to 1.05
* More Bones.
* Undoes the undoing of the other fix PR
Co-authored-by: Emily <null>
2021-10-25 18:11:54 +02:00
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
1a800cc470
modifications
2021-06-07 19:40:16 -07:00
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
9d8c7dff35
Update code/modules/smithing/smithed_items.dm
...
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
2021-03-23 23:15:03 -04:00
99caab1ec8
Update smithed_items.dm
2021-03-23 21:08:11 -04:00
5d51025ad6
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-15 14:39:16 -07:00
80469a32f9
WHY WON'T YOU HIDE CORRECTLY
2021-03-01 22:33:21 -06:00
70c828f74d
changes
2021-02-28 00:27:14 -07:00
fccf24ac17
sheef
2021-01-19 16:54:49 -06:00
7f7ba4caf8
Merge pull request #13481 from DeltaFire15/smithery-fixes
...
A bunch of blacksmithing fixes / tweaks
2020-10-03 18:02:42 -07:00
0746116e17
fixes a bunch of blacksmithing stuff
...
the blacksmithing skill is now actually dwarfy instead of not because of a typo
picking up how ingots without gloves is now not a better decision than picking them up with non-heatresistant gloves.
you can't interact with anvils while they are already being worked to prevent issues.
Also fixes associative skill level code a tiny bit.
2020-09-25 22:04:55 +02:00
5f2f524065
Merge pull request #13355 from lolman360/AnPrimAssistants
...
fixes glaives
2020-09-11 14:16:22 -07:00
18d949e674
Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou
...
Brass Material Datum: "Sbetr Jryy!"
2020-09-11 14:15:54 -07:00
9f191c67f3
some stuff
2020-09-07 21:47:35 +02:00
cf61133476
typofix ( #13358 )
2020-09-06 20:43:19 +02:00
4dacbbb0a9
deeper brass color™ (and damage)
2020-09-05 20:34:49 -04:00
280e3e22a3
Update smithed_items.dm
2020-09-06 10:23:58 +10:00
de8ed28f2c
cat roomba.jpg
2020-09-05 19:14:51 -04:00
cddd46fce3
Maybe this will work. Maybe it won't.
2020-09-05 18:52:20 -04:00
1b52ceb63a
Various changes.
2020-09-01 11:43:01 +10:00
4d6fb10dff
Nyoops.
2020-09-01 10:55:55 +10:00
400391e8d8
Bronze anvil tweaks, clarity.
2020-09-01 10:37:56 +10:00
f223c9eeb5
eee
2020-08-29 18:38:17 +10:00
c2ded74d6a
e
2020-08-28 12:54:58 +10:00
54c32f9162
Update smithed_items.dm
2020-08-27 17:43:46 +10:00
a988dcce73
better
2020-08-27 12:02:18 +10:00
BongaTheProto