Commit Graph

209 Commits

Author SHA1 Message Date
The0bserver
64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
The0bserver
bcbccd864f I'm going monkey 2021-04-13 19:46:07 -04:00
The0bserver
2046ca2eb2 a test 2021-04-13 19:42:07 -04:00
The0bserver
2e65dbf07f Mandrill Maze 2021-04-13 18:45:01 -04:00
The0bserver
4b888fe715 Emag Crate 2021-04-13 18:28:58 -04:00
Lin
05ae354d87 Merge pull request #14565 from DeltaFire15/wood-pack-correction
Corrects the wood plank crate's name and description
2021-04-04 23:18:55 -05:00
Hatterhat
8b412d7d49 Update materials.dm (#14564) 2021-04-04 00:12:52 +02:00
DeltaFire
1e2b4c5a20 fix 2021-04-04 00:06:18 +02:00
silicons
602140af99 Merge pull request #14497 from Hatterhat/lever-guns
.38 lever-action rifles but not actually implemented
2021-03-24 19:22:36 -06:00
Hatterhat
30a9ad5059 yeehaw :) 2021-03-23 18:55:00 -05:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
kappa-sama
524bb79f0e tgui machine broke 2021-03-19 15:32:53 -03:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
Letter N
0bb5ec3316 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-21 09:55:36 +08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SmArtKar
756be084bc Decks are saveable! 2021-02-17 18:50:23 +03:00
Letter N
6286d40082 code works 2021-02-12 17:26:08 +08:00
SmArtKar
2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00
SmArtKar
7b2e1ef44f TCG! 2021-02-02 14:40:29 +03:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
Letter N
cd5d558fad safety? what's that?
* maybe table-breaking change
2021-01-04 11:57:12 +08:00
silicons
c947dfdca5 Merge pull request #13940 from Chiirno/CargoParamedSuit
Paramedic EVA suit now purchasable from Cargo
2021-01-03 18:09:59 -07:00
Chiirno
6f5837d14f changed the description of the crate. 2020-12-31 17:42:07 -04:00
Chiirno
d936b43e98 adjusted the price to 1975. Above eva suit at 1500 and beow medical hardsuit at 2750 2020-12-31 17:27:25 -04:00
Chiirno
7d0c4030c9 first commit, adding the paramed eva suit as an option for cargo. 2020-12-31 17:24:30 -04:00
Xantholne
0db821f4f5 Fixes missing electus red from trying to be basic parrot and adds 2020-12-29 19:33:09 -07:00
Xantholne
51ac7286e6 aaaaaaa 2020-12-28 00:57:32 -07:00
Xantholne
2cca3314a7 Adds to bird crate 2020-12-27 23:55:58 -07:00
MrJWhit
477330197c Huh we already had this 2020-12-10 01:14:43 -05:00
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