silicons
efc4e089c9
Merge pull request #13503 from Hatterhat/glaive-knuckledagger
...
survival daggers, luxpod capsule resprite, glaive sprite tweaks soon (tm)
2020-10-06 17:03:44 -07:00
Detective-Google
260ed6eff6
fixes arcade carpet
2020-10-05 21:27:42 -05:00
silicons
9faff5ecb6
Merge pull request #13461 from Detective-Google/arcade-carpets
...
adds arcade carpets
2020-10-03 18:07:44 -07:00
silicons
7586c38d52
Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix
...
Fixes borg KA upgrade installation
2020-10-03 18:03:11 -07:00
silicons
6a8814cd1e
Merge pull request #13484 from DeltaFire15/plushling-fix
...
Fixes plushlings
2020-10-03 14:20:33 -07:00
Hatterhat
4195f96876
glaive daggers squashed
2020-10-03 14:32:19 -05:00
Timothy Teakettle
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
Detective Google
98703e6ad6
Merge remote-tracking branch 'upstream/master' into arcade-carpets
2020-10-01 13:41:10 -05:00
DeltaFire
e012b8f082
typo
2020-10-01 17:18:28 +02:00
DeltaFire
d54a899695
fixes KA modkits being installed in borgs by others
...
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02:00
silicons
c8d6f3d22a
Merge pull request #13477 from LetterN/patch-2
...
Adds craftable railings
2020-10-01 03:13:51 -07:00
silicons
d8e58b1c48
Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
...
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
silicons
47aef0d574
Merge pull request #13443 from ItzGabby/gabby-wooden-floors
...
Gabbys new wooden floor tile types
2020-10-01 03:04:21 -07:00
silicons
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Letter N
d9ab31e199
commit 2
2020-10-01 11:30:01 +08:00
Detective Google
643421bc23
adds arcade carpets
...
yay
2020-09-28 14:43:03 -05:00
Tupinambis
f552459f4a
13->14 distro
2020-09-27 17:28:50 -05:00
Tupinambis
d2500fe389
Adds Methane and Methyl Bromide
2020-09-27 15:15:58 -05:00
silicons
1092eacc6e
Merge pull request #13397 from ArchieBeepBoop/microfans
...
Micro Powered Fans!
2020-09-27 00:03:43 -07:00
ItzGabby
b97b595f6f
Three new wooden floor types
2020-09-26 18:29:46 -04:00
DeltaFire
178be2b643
fixes plushlings
...
This makes it so the snowflake id is actually set if the plush is a snowflake, and also makes plushlings not become invisible anymore if they absorb a snowflake plush
2020-09-25 23:41:18 +02:00
Timothy Teakettle
106b8ccead
Merge branch 'master' into heterochromia
2020-09-24 22:09:03 +01:00
Putnam
e89e7adda4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments
2020-09-21 03:31:35 -07:00
Artur
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
Ghom
868e464b40
fixes linter issues, removes acid degrading armor ( #13399 )
...
* fix
* more
* Update brawn.dm
* Update ticketmachine.dm
2020-09-19 15:04:48 +02:00
silicons
54f48c3754
Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
...
Some bodypart-related fixes
2020-09-19 06:02:32 -07:00
Dip
8d33b3a8da
convert to machinery type
2020-09-16 20:28:31 -03:00
Dip
7e00d81758
Microfan Rework
2020-09-16 19:28:59 -03:00
silicons
ca8b13b86a
Merge pull request #13255 from timothyteakettle/limbs
...
you can choose limbs to be prosthetic/amputated
2020-09-16 00:31:18 -07:00
Timothy Teakettle
12bf3aebda
Merge remote-tracking branch 'upstream/master' into cool-ipcs
2020-09-16 05:12:20 +01:00
Timothy Teakettle
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
silicons
95ebeac5b6
fix
2020-09-15 17:27:11 -07:00
Dip
394d383746
Clone Microfans
2020-09-15 19:27:58 -03:00
DeltaFire
f892309903
fixes
2020-09-15 17:35:58 +02:00
Putnam
f13af9f72e
Made gases only display in analyzers if they have at least 0.005 moles.
2020-09-14 02:37:47 -07:00
DeltaFire
bd183e8e28
removes an unneeded check
2020-09-13 13:27:57 +02:00
DeltaFire
8975b93b37
no petting and not petting at the same time
2020-09-13 03:43:31 +02:00
DeltaFire
2d8655d712
plushie shapeshifter
2020-09-13 03:25:43 +02:00
silicons
18d949e674
Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou
...
Brass Material Datum: "Sbetr Jryy!"
2020-09-11 14:15:54 -07:00
Timothy Teakettle
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
Timothy Teakettle
f1cd94fc97
emp rework
2020-09-09 23:14:06 +01:00
silicons
45ee1cbbf8
Merge pull request #13334 from CameronWoof/revert-12739-DRAKEBORG
...
Revert Drakeborgs
2020-09-06 15:22:16 -07:00
silicons
9e204f167f
Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
...
Miner Loot Shuffle MK III
2020-09-06 01:58:46 -07:00
BlackMajor
63b1bfd45c
Merge pull request #13303 from Citadel-Station-13/silicons-patch-27
...
combat defibs now hit for disarm + 35 stamina (old stunbaton values) instead of disarm + 75 stamina
2020-09-06 18:03:59 +12: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
BlackMajor
3eafab209d
Merge pull request #13136 from Citadel-Station-13/silicons-patch-8
...
the station charter rename now disallows any name with characters above a single byte in length unless an admin edits it to allow unicode
2020-09-06 17:50:32 +12:00
The0bserver
cddd46fce3
Maybe this will work. Maybe it won't.
2020-09-05 18:52:20 -04:00
silicons
6e6ca622e6
Merge pull request #13279 from Hatterhat/the-desword-block-buff
...
alternate to 13728 - 60% rngblock, activeblock covers sides, effectiveness against projectiles upped
2020-09-05 13:10:50 -07:00
silicons
7b50b22c7b
Merge pull request #13244 from lolman360/AnPrimAssistants
...
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
2020-09-05 02:20:11 -07:00
