Commit Graph

5723 Commits

Author SHA1 Message Date
silicons
de8d778f76 Merge pull request #14134 from Arturlang/Give_improvements
[READY]Give Improved
2021-01-25 23:02:03 -07:00
silicons
efecc1804b Merge pull request #14114 from Hatterhat/fgs
itt: i dont test my code again - free golem ship GPSes start disabled
2021-01-25 22:59:09 -07:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Artur
91cd7378ca Give Improved 2021-01-24 16:05:42 +02:00
MrJWhit
3e157c3aa8 Update headset.dm 2021-01-22 19:18:28 -05:00
Hatterhat
95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
silicons
fa587e3d1a Merge pull request #14100 from Hatterhat/sheath-exp
twinsheath additions
2021-01-20 15:20:45 -07:00
silicons
f7c6dbd8ba Merge pull request #14110 from BlueWildrose/nicebobbertsonsyougotthere
Removes oversized genitalia analysis from medical scanners
2021-01-20 15:17:12 -07:00
Blue Wildrose
80ccc93fd7 Removes breast and penis analysis from medical scanners 2021-01-20 07:32:03 -07:00
Letter N
02ca168df3 why are we building windows facing nothing but rock infront of it? 2021-01-20 11:37:44 +08:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Hatterhat
fccf24ac17 sheef 2021-01-19 16:54:49 -06:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
Lin
73213b4bad Merge pull request #14079 from LetterN/patch-3
Fixes this vending oversight
2021-01-18 13:17:05 -06:00
silicons
2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
2021-01-17 20:42:19 -07:00
silicons
829e946755 Merge pull request #14061 from Hatterhat/gauze-parity
something something gauze things
2021-01-17 20:40:09 -07:00
Letter N
0b088be4df missing , 2021-01-17 18:00:43 +08:00
Letter N
919b8c8d57 Update machine_circuitboards.dm 2021-01-17 17:54:06 +08:00
DeltaFire
3e917653c7 Merge pull request #14044 from corin9090/beadies
Belt slot prayer beads
2021-01-15 18:50:14 +01:00
DeltaFire
d331dd4b1e Merge pull request #14046 from Citadel-Station-13/silicons-patch-10
buffs and fixes BOOMERANG STUNBATONS
2021-01-15 18:30:32 +01:00
DeltaFire
de40e96180 Merge pull request #14047 from Citadel-Station-13/silicons-patch-11
boomerangs now properly turn ON your throw mode rather than turning it off when it already is
2021-01-15 18:30:16 +01:00
DeltaFire
aa1cae9f33 Merge pull request #14054 from TheObserver-sys/AReturnToForm
Returns the Maintenance Shotgun to it's original recipe. Removes the Maintenance Rifle, and associated items.
2021-01-15 18:22:05 +01:00
Hatterhat
798b25846d gauze parity 2021-01-14 20:53:55 -06:00
The0bserver
1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
silicons
1df2257e61 Merge pull request #14052 from SiliconMain/baitbegone
Update engineering.dm
2021-01-13 22:43:01 -07:00
SiliconMain
cccb547a72 Update engineering.dm 2021-01-13 23:41:49 -06:00
The0bserver
ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
silicons
bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
2021-01-13 16:53:01 -07:00
silicons
9ddb3dc5d9 fix 2021-01-13 16:22:43 -07:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
silicons
06bc57580a Update stunbaton.dm 2021-01-13 15:22:41 -07:00
silicons
701bacd355 Update stunbaton.dm 2021-01-13 15:06:35 -07:00
DeltaFire
a9b420f68f Merge pull request #14038 from Hatterhat/atomization-never-heard-of-her
an unatomic PR designed for maximizing maintainer suffering
2021-01-13 18:28:59 +01:00
corin9090
9f0280309d Belt slot prayer beads
uwu
2021-01-13 09:24:55 -08:00
DeltaFire
6192d4ddab fixes 2021-01-13 00:08:59 +01:00
DeltaFire
f591bff85b sprite stuff 2021-01-12 23:54:40 +01:00
DeltaFire
032c169098 whoops 2021-01-12 23:29:51 +01:00
Hatterhat
2042de0f19 sterilegauze buff 2021-01-12 16:13:08 -06:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
DeltaFire
13beddd42b nanogel time 2021-01-12 23:02:44 +01:00
SiliconMain
2d3e24fee4 Update engineering.dm 2021-01-12 14:43:54 -06:00
Blue Wildrose
059d35921a quit making me drop my catgirl 2021-01-12 13:41:23 -07:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
2021-01-09 15:39:06 -07:00
silicons
fffafff5d3 Merge pull request #13995 from DeltaFire15/xeno-clickdelay
(Somewhat) fixes clickdelay when attacking objects.
2021-01-09 15:38:07 -07:00
silicons
22a32d25b4 Merge pull request #14006 from DeltaFire15/borg-shell-dupe
Attempting to complete a borg AI shell without a cell installed no longer causes issues
2021-01-09 15:37:45 -07:00
DeltaFire
23c5f1744d actually 2021-01-09 00:12:10 +01:00
DeltaFire
4f3df626c6 no cell no problem 2021-01-09 00:09:17 +01:00
silicons
bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00