1b1ed21f42
No adrenals for borgs please
2019-11-19 22:13:22 +13:00
2494ea4d07
Merge pull request #9824 from YakumoChen/YakumoChen-mariplush
...
Adds Marisa plushie
2019-11-19 01:55:59 -07:00
40a01dedfe
Merge pull request #9806 from BlackMajor/Yote
...
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
2019-11-19 01:54:47 -07:00
f9b632019b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-18 21:39:45 -06:00
c188c20f37
Merge pull request #9802 from Ghommie/Ghommie-cit349
...
Unmodularize bikehorns and holy weapons.
2019-11-19 03:24:38 +00:00
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
cdfd5bbeac
mistakes were made.
2019-11-19 00:55:14 +01:00
f6b06a878c
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
2019-11-19 00:50:18 +01:00
bddb437872
It works now.
2019-11-18 18:30:46 +01:00
d90812b0b2
reverts rapier nerfs
2019-11-18 06:26:25 -05:00
86072fe682
"
2019-11-18 04:15:33 +01:00
deadffe96f
missing parenthesis.
2019-11-18 03:26:04 +01:00
1c39a3bc6d
Adds a few extra cardboard cutout variants.
2019-11-18 03:23:24 +01:00
c575b3c798
base ball bats, katanan's and chainsaws will still fit
2019-11-17 13:54:18 -05:00
7780a14a60
rapier huge
2019-11-17 13:49:32 -05:00
05c74c731b
Ports TG pew files
2019-11-17 14:20:44 +00:00
5c89447cf9
Update plushes.dm
2019-11-16 09:56:57 +00:00
6aa6eaafe6
Merge branch 'master' into abductor-update
2019-11-15 23:24:51 +00:00
3edaf75722
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
2019-11-15 16:58:45 -05:00
c20bc123ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
f401e622c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-15 01:01:08 +01:00
5bb6247a6d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit349
2019-11-15 00:57:38 +01:00
d5a245945c
Merge pull request #9742 from Seris02/gpsthing
...
makes gps show location on examine
2019-11-14 16:44:40 -07:00
6484eea339
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-15 00:36:50 +01:00
ca99a8285c
Merge pull request #9803 from Ghommie/Ghommie-cit350
...
Ports Improved beach away mission and some fluff mapping items.
2019-11-14 16:36:19 -07:00
8c247a566a
Merge pull request #9783 from Ghommie/Ghommie-cit343
...
Fixing Aux base camera RCD door settings and toggle window type actions.
2019-11-14 16:22:08 -07:00
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
2f4562a63b
Merge pull request #9656 from Ghommie/Ghommie-cit290
...
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
8f08e1017e
Merge pull request #9688 from Ghommie/Ghommie-cit306
...
Fixing gibspawner runtimes and improving them, how gruesome...
2019-11-14 15:51:20 -07:00
d8e89b235f
Merge pull request #9689 from Ghommie/Ghommie-cit307
...
How many times I have encountered this sort of issue in the past and how much of a meme it was...
2019-11-14 15:50:52 -07:00
dfa2296758
Merge pull request #9430 from Ghommie/Ghommie-cit220
...
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
2019-11-14 15:44:59 -07:00
322c90fab2
Mistake I have done when copypasting.
2019-11-14 13:32:57 +01:00
487f98bf68
Merge pull request #9775 from Ghommie/Ghommie-cit340
...
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
2019-11-14 01:40:16 -07:00
3015ec5c04
Merge pull request #9764 from Ghommie/Ghommie-cit335
...
Dreamchecker compatibility changes, part 1.
2019-11-14 01:37:41 -07:00
0c33757b14
Fixes a few bugs
2019-11-14 18:54:57 +13:00
ce94da9ed3
Merge branch 'master' into Yote
2019-11-14 17:37:57 +13:00
b9a7685830
Adds dogborg catch for doggos and some
2019-11-14 17:14:14 +13:00
aa441fba5d
Ports Improved beach away mission.
2019-11-13 22:52:39 +01:00
3ce4ef8e27
f
2019-11-13 21:17:40 +01:00
cef72b93eb
The files.
2019-11-13 20:35:21 +01:00
248586cfd7
Unmodularize bikehorns and holy weapons.
2019-11-13 20:28:19 +01:00
ec57e28c17
Merge branch 'master' into Cargo_MKII
2019-11-13 08:00:24 -05:00
e142ed03dd
Merge pull request #9773 from Ghommie/Ghommie-cit339
...
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
2019-11-12 23:58:15 -07:00
a16219d97a
Merge pull request #9772 from DeltaFire15/weh
...
Adds eight new plushies to the game while integrating kevs' plush PR
2019-11-12 23:56:01 -07:00
4d4d495765
Hmm I wonder if anyone would notice if I smuggled another plush into this PR
...
What it says on the tin, got asked via dms to add another plush to my PR so here we go.
Char is Minty.
2019-11-12 15:32:06 +01:00
aad2b5bcd5
Fixing Aux base camera/drone RCD actions.
2019-11-12 04:35:10 +01:00
e50c56150e
ports "Adds superlube to the clown ruin" and buffs clown PDAs
2019-11-11 23:10:22 +01:00
d06b6fd83e
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
2019-11-11 21:34:47 +01:00
421be859fb
Ok nice typo gang
2019-11-11 21:08:32 +01:00
51aacedb9f
Little fix
2019-11-11 18:17:07 +01:00
BlackMajor