cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,291 Commits 55 Branches 0 Tags
54641ce2015f632b07e09f065abc119f677b7fed
Commit Graph

85 Commits

Author SHA1 Message Date
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
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
WanderingFox95
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
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
silicons
1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
CuteMoff
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
CuteMoff
99caab1ec8 Update smithed_items.dm 2021-03-23 21:08:11 -04:00
silicons
5d51025ad6 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-15 14:39:16 -07:00
Hatterhat
80469a32f9 WHY WON'T YOU HIDE CORRECTLY 2021-03-01 22:33:21 -06:00
silicons
70c828f74d changes 2021-02-28 00:27:14 -07:00
Hatterhat
fccf24ac17 sheef 2021-01-19 16:54:49 -06:00
silicons
7f7ba4caf8 Merge pull request #13481 from DeltaFire15/smithery-fixes 
A bunch of blacksmithing fixes / tweaks
 2020-10-03 18:02:42 -07:00
DeltaFire
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
silicons
5f2f524065 Merge pull request #13355 from lolman360/AnPrimAssistants 
fixes glaives
 2020-09-11 14:16:22 -07:00
silicons
18d949e674 Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou 
Brass Material Datum: "Sbetr Jryy!"
 2020-09-11 14:15:54 -07:00
DeltaFire
9f191c67f3 some stuff 2020-09-07 21:47:35 +02:00
DeltaFire15
cf61133476 typofix (#13358) 2020-09-06 20:43:19 +02:00
The0bserver
4dacbbb0a9 deeper brass color™ (and damage) 2020-09-05 20:34:49 -04:00
lolman360
280e3e22a3 Update smithed_items.dm 2020-09-06 10:23:58 +10:00
The0bserver
de8ed28f2c cat roomba.jpg 2020-09-05 19:14:51 -04:00
The0bserver
cddd46fce3 Maybe this will work. Maybe it won't. 2020-09-05 18:52:20 -04:00
lolman360
1b52ceb63a Various changes. 2020-09-01 11:43:01 +10:00
lolman360
4d6fb10dff Nyoops. 2020-09-01 10:55:55 +10:00
lolman360
400391e8d8 Bronze anvil tweaks, clarity. 2020-09-01 10:37:56 +10:00
lolman360
f223c9eeb5 eee 2020-08-29 18:38:17 +10:00
lolman360
c2ded74d6a e 2020-08-28 12:54:58 +10:00
lolman360
54c32f9162 Update smithed_items.dm 2020-08-27 17:43:46 +10:00
lolman360
a988dcce73 better 2020-08-27 12:02:18 +10:00
lolman360
408babe0dc Math 2020-08-27 12:00:11 +10:00
lolman360
2b057b2483 reverti9es 2020-08-25 19:03:04 +10:00
lolman360
43af265037 Update finished_items.dm 2020-08-25 19:01:24 +10:00
lolman360
519592693b e 2020-08-25 19:01:07 +10:00
lolman360
c79f63bd00 e 2020-08-25 18:54:22 +10:00
lolman360
b5c000cac4 eee 2020-08-24 23:48:45 +10:00
lolman360
4e82ce87eb EEEEEEEEEEEEe 2020-08-24 23:43:42 +10:00
lolman360
a2f33d27a2 ee 2020-08-24 23:42:39 +10:00
lolman360
dcbdc05c5a Update smithed_items.dm 2020-08-24 23:31:21 +10:00
lolman360
30471d4171 Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants 2020-08-24 21:08:00 +10:00
lolman360
e646b3af32 bet 2020-08-24 21:03:11 +10:00
lolman360
9d9a6d0d5d Update anvil.dm 2020-08-24 20:33:21 +10:00
lolman360
e8379eb6a2 whoops 2020-08-24 19:11:01 +10:00
lolman360
2df3bbd822 r 2020-08-24 18:55:48 +10:00
lolman360
94e24a9738 anvillan 2020-08-24 17:52:42 +10:00
lolman360
ff5c4d779f ok 2020-08-24 13:19:05 +10:00
lolman360
579d7bb4f2 whoops! 2020-08-24 12:49:54 +10:00
lolman360
037b939f55 THIS WAS THE PROBLEM THE ENTIRE TIME 2020-08-24 12:36:17 +10:00
lolman360
97e5fbd29f YOU CAN UNPACK IT NOW FOLKS, KATANAS NO LONGER DROPDEL 2020-08-24 11:48:22 +10:00
lolman360
d9f1ebd6f5 MOVING SOME LINES AROUND FOLKS 2020-08-24 11:44:18 +10:00