Detective Google
|
643421bc23
|
adds arcade carpets
yay
|
2020-09-28 14:43:03 -05:00 |
|
silicons
|
07b28f40de
|
Merge pull request #13359 from Ghommie/Ghommie-cit838
Turf visuals fix plus corrected names of a couple things.
|
2020-09-07 13:42:05 -07:00 |
|
Ghommie
|
4a04b22b72
|
Turf visuals fix plus corrected names of a couple things.
|
2020-09-06 18:53:01 +02:00 |
|
BlackMajor
|
1943a2fdd7
|
Merge pull request #13246 from silicons/anomaly_manufacturing
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
|
2020-09-06 17:53:35 +12:00 |
|
lolman360
|
94e24a9738
|
anvillan
|
2020-08-24 17:52:42 +10:00 |
|
silicons
|
b995581a11
|
changes
|
2020-08-23 05:33:19 -07:00 |
|
silicons
|
bd5766a8be
|
changes
|
2020-08-23 05:27:53 -07:00 |
|
silicons
|
01dd2f389b
|
Merge branch 'pr-13067'
|
2020-08-16 18:38:13 -07:00 |
|
DeltaFire
|
0f27a89e5d
|
yeah this belongs into the armory
Hellgun single pack
goodies > armory
|
2020-08-10 18:41:56 +02:00 |
|
silicons
|
8ef539b417
|
Merge pull request #13053 from kappa-sama/patch-39
makes cargo's Dirty Magazines 3x cheaper
|
2020-08-09 05:43:37 -07:00 |
|
Putnam
|
467f66b2a6
|
Removed crocin/hexacrocin.
|
2020-08-08 00:46:30 -07:00 |
|
Hatterhat
|
6f754188ac
|
funny guns go pew
|
2020-08-07 18:02:33 -05:00 |
|
kappa-sama
|
865970fcc3
|
lol
|
2020-08-06 21:34:25 -04:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
CameronWoof
|
df7a1f2b8d
|
adds spaceman's trumpet seeds to the exotic seeds crate
|
2020-07-24 23:08:36 -07:00 |
|
timothyteakettle
|
8360bb1a7f
|
section 2
|
2020-07-24 23:44:57 +01:00 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
YakumoChen
|
475a546033
|
adds wedding crate
|
2020-07-10 04:06:55 +00:00 |
|
YakumoChen
|
bfa672b091
|
adds some rings to the wedding crate
|
2020-07-09 07:49:11 +00:00 |
|
YakumoChen
|
1a82955f32
|
adds a wedding crate
|
2020-07-09 07:22:33 +00:00 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
Ghommie
|
29a8d2ed78
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813
|
2020-06-20 00:07:47 +02:00 |
|
kevinz000
|
118ac1a775
|
Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
|
2020-06-17 20:10:04 -07:00 |
|
Timothy Teakettle
|
d7bce8aec0
|
ports some events
|
2020-06-15 20:22:40 +01:00 |
|
Timothy Teakettle
|
34c9a2f821
|
part 4
|
2020-06-11 21:45:32 +01:00 |
|
Timothy Teakettle
|
38bf529f3c
|
a tonne of fixes
|
2020-06-11 20:18:36 +01:00 |
|
Timothy Teakettle
|
4c55e86da7
|
part 2
|
2020-06-10 23:14:25 +01:00 |
|
b1tt3r1n0
|
764ba26ace
|
Pouches (#12432)
* The Ammo Pouch
It holds magazines and most forms of ammo.
* The Ammo Pouch
It holds magazines and most forms of ammo.
|
2020-06-09 03:22:39 -07:00 |
|
Ghommie
|
495ccc99c5
|
Porting some cargo/vending updates.
|
2020-06-08 06:12:51 +02:00 |
|
Ghommie
|
a84e7bcecc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-05-24 04:00:51 +02:00 |
|
Detective Google
|
d03d20d570
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-22 13:52:56 -05:00 |
|
Ghom
|
ed90c59d65
|
Removal of """silk""" (#12221)
* Removal of """silk"""
* AAA
* Ashwalkers now start with durathread seeds
|
2020-05-19 23:43:46 -07:00 |
|
Ghommie
|
58432dd6be
|
Thanks Trilby.
|
2020-05-18 03:21:02 +02:00 |
|
Ghommie
|
2eb3089ccb
|
Certain packs (mostly armory/security) can not be privately bought anymore.
|
2020-05-17 23:38:26 +02:00 |
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
Trilbyspaceclone
|
2e1cc498a3
|
corrects WT-550 ammo to state 32 rather then 20 (#12275)
|
2020-05-17 01:05:24 +02:00 |
|
Detective Google
|
e2ddfcf77b
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-13 00:56:25 -05:00 |
|
Trilbyspaceclone
|
871361936c
|
Replaces mosins in russian crates with 10mm surplus rifles (#12176)
* Update security.dm
* Update armory.dm
* desc
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-13 05:35:01 +02:00 |
|
Detective Google
|
bfde367c4e
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-11 20:56:42 -05:00 |
|
Trilbyspaceclone
|
b019915d10
|
Removes alien crate adds ape crate (#12178)
* Update science.dm
* Update snacks_meat.dm
* Update science.dm
* Apply suggestions from code review
kinda didnt want to just take tg's ape cubes but what ever
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-11 01:10:45 +02:00 |
|
Detective Google
|
1d298232eb
|
adds Snowmobiles, (ATVs that move fullspeed on snow and slow on plating)
|
2020-05-09 20:06:25 -05:00 |
|
kevinz000
|
7828c4a5ab
|
Merge pull request #12102 from Ghommie/Ghommie-cit722
Removing cargo "paperwork" and a few other bloat packs.
|
2020-05-07 09:11:45 -07:00 |
|
Putnam
|
801956a1f9
|
Reverts #10352.
|
2020-05-03 17:44:00 -07:00 |
|
Ghommie
|
65899bf906
|
Removing cargo "paperwork" and a few other bloat packs.
|
2020-05-03 19:56:00 +02:00 |
|
TrilbySpaceClone
|
c8b3032087
|
Merge branch 'master' into cube-world
|
2020-04-23 02:04:56 -04:00 |
|
Ghom
|
5a6a205b9d
|
Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
|
2020-04-21 15:50:44 +02:00 |
|
TrilbySpaceClone
|
25b1b889dc
|
amazing truely amazing
|
2020-04-19 19:09:20 -04:00 |
|
Ghommie
|
39aef14924
|
More ToS Compliance.
|
2020-04-19 02:40:58 +02:00 |
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|