Ghom
|
ed90c59d65
|
Removal of """silk""" (#12221)
* Removal of """silk"""
* AAA
* Ashwalkers now start with durathread seeds
|
2020-05-19 23:43:46 -07:00 |
|
Trilbyspaceclone
|
c6c4d61ee3
|
Cargo Rework - MK *why did I ever lison to people that were just powergamers?* (#11975)
* Baby wheels off
* Oh god factorio is dead!
* Gas-p the nerfs!
* Update gear.dm
* tools
* Update large_objects.dm
|
2020-05-15 03:57:28 +02:00 |
|
Ghommie
|
65899bf906
|
Removing cargo "paperwork" and a few other bloat packs.
|
2020-05-03 19:56:00 +02:00 |
|
Artur
|
ddcfcb5cd8
|
Conflicts sure are !!FUN!!
Also adds dolphin gloves to the glove crate, and fixes fortitude
|
2020-04-15 12:33:59 +03:00 |
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03:00 |
|
kevinz000
|
f60cf32562
|
Merge pull request #11775 from Trilbyspaceclone/frail-crafting
Frail crafting - Glass work additions and changes!
|
2020-04-09 02:41:01 -07:00 |
|
Trilbyspaceclone
|
97dbd6ae7f
|
Update parts.dm
|
2020-04-07 18:38:53 -04:00 |
|
TrilbySpaceClone
|
b350436fbc
|
working
|
2020-04-07 18:31:23 -04:00 |
|
TrilbySpaceClone
|
e9d2e798a3
|
more glasswork
|
2020-04-07 17:58:23 -04:00 |
|
necromanceranne
|
0c46c151f9
|
Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage.
|
2020-04-03 19:42:25 +11:00 |
|
Ghommie
|
86898cc451
|
Force pushed updates
|
2020-03-22 01:43:19 +01:00 |
|
Hatterhat
|
1e10a042be
|
arrow craft nitpicking (alt title: "why are subtypes like this") (#11516)
* subtypes (tm)
* ok fine jeez
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
|
2020-03-18 19:34:14 +01:00 |
|
Ghommie
|
f2c8a7cd6f
|
Porting a couple material datums code updates and fixes.
|
2020-03-04 15:59:46 +01:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
kevinz000
|
6f31e1270e
|
Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
|
2020-02-19 19:05:49 -07:00 |
|
kevinz000
|
6df64da7d6
|
Merge pull request #11133 from Citadel-Station-13/Ghommie-patch-2
Nerfs the fermenting barrel export industry & co.
|
2020-02-19 19:00:02 -07:00 |
|
Ghom
|
0619521418
|
Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
Corrects a few cargo crates/exports (and nerfs some)
|
2020-02-19 02:10:25 +01:00 |
|
Ghom
|
eddefd4d25
|
Update large_objects.dm
|
2020-02-17 15:07:17 +01:00 |
|
TrilbySpaceClone
|
a1f1a01a81
|
grammer and quiver
|
2020-02-15 00:52:19 -05:00 |
|
TrilbySpaceClone
|
bbe1ddc0cf
|
silk, bows, and graytide!
|
2020-02-14 23:04:02 -05:00 |
|
Winter Flare
|
e11c8c3647
|
Fixing a moneymaking oversight.
|
2020-02-10 00:35:31 -05:00 |
|
TrilbySpaceClone
|
e5236eebb1
|
hey lets do corrections
|
2020-02-08 17:39:00 -05:00 |
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
Seris02
|
81039b131b
|
fixes
|
2020-01-31 09:49:08 +08:00 |
|
Ghommie
|
5875f2578c
|
demodularize and removes lot of unused clothing with missing sprites.
|
2020-01-28 02:32:46 +01:00 |
|
Trilbyspaceclone
|
89bb60ac16
|
Update parts.dm
|
2020-01-20 16:12:40 -05:00 |
|
TrilbySpaceClone
|
6a2696f1f8
|
ghommie said
|
2020-01-07 03:10:22 -05:00 |
|
TrilbySpaceClone
|
8aee20cdf3
|
Ready
|
2019-12-28 17:55:20 -05:00 |
|
kevinz000
|
178aedc5cc
|
Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
|
2019-11-14 16:38:27 -07:00 |
|
kevinz000
|
4c89b8c33f
|
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
|
2019-11-14 16:00:45 -07:00 |
|
kappa-sama
|
6ad9c7fef0
|
no shotgun i guess
shit guess i gotta add this to traumas too
|
2019-11-13 17:01:30 -05:00 |
|
TrilbySpaceClone
|
73661cfe52
|
more fixing+ chem selling tweaks
|
2019-11-13 09:39:42 -05:00 |
|
TrilbySpaceClone
|
ec57e28c17
|
Merge branch 'master' into Cargo_MKII
|
2019-11-13 08:00:24 -05:00 |
|
TrilbySpaceClone
|
6e328ea1b1
|
art of the deal
|
2019-11-11 07:26:12 -05:00 |
|
Ghommie
|
9591bb5471
|
porting "global to static"
|
2019-11-09 22:53:56 +01:00 |
|
TrilbySpaceClone
|
0662245d80
|
corrections
|
2019-11-06 22:52:44 -05:00 |
|
Trilbyspaceclone
|
3ab70cbc26
|
Update sheets.dm
|
2019-11-03 13:04:48 -05:00 |
|
TrilbySpaceClone
|
a8248c68f4
|
perhaps
|
2019-11-03 12:53:02 -05:00 |
|
Trilbyspaceclone
|
4fa6c4d5c0
|
Apply suggestions from code review
Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
|
2019-11-03 11:10:30 -05:00 |
|
TrilbySpaceClone
|
5c4cd15762
|
Hmm
|
2019-11-03 11:05:45 -05:00 |
|
Trilbyspaceclone
|
db19eae0f8
|
Apply suggestions from code review
Grammar
Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
|
2019-10-27 08:44:46 -04:00 |
|
TrilbySpaceClone
|
63cb466360
|
MK II
|
2019-10-26 18:59:34 -04:00 |
|
kevinz000
|
50b9ae3cf3
|
Update large_objects.dm
|
2019-10-25 09:39:00 -07:00 |
|
Trilbyspaceclone
|
8ce8246182
|
lowers paperwork
|
2019-10-21 19:01:59 -04:00 |
|
Trilbyspaceclone
|
113f62a705
|
right
we removed my tools...
|
2019-10-17 01:38:29 -04:00 |
|
TrilbySpaceClone
|
d37cb76f42
|
part 3
|
2019-08-28 21:18:51 -04:00 |
|
TrilbySpaceClone
|
0e5ddc88c1
|
Part 2
bounty nerfs
|
2019-08-28 19:51:07 -04:00 |
|
TrilbySpaceClone
|
f0a1d44503
|
Part 1
The food brake
|
2019-08-28 16:54:10 -04:00 |
|