DeltaFire
8414db5add
Merge pull request #13814 from Xantholne/TwinSwordSheath
...
Fixes twin sword sheaths icon/item state from being blank sprites
2020-12-21 02:20:32 +01:00
Xantholne
1c968e6ebe
period equals
2020-12-20 16:00:18 -07:00
silicons
34f6697e81
Merge pull request #13796 from keronshb/fixedscarpchanges
...
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
Xantholne
a5c14b90c5
Adds missing sheathing sounds
2020-12-18 22:56:30 -07:00
Xantholne
d60d72c7b7
Fixes twin belts
...
gives item state and icon state to be functional
2020-12-18 22:03:24 -07:00
keronshb
3d7c896100
Scarp Changes and Bundle
...
This should really fix it now.
2020-12-15 20:10:21 -05:00
MrJWhit
f5b99b83f8
Fully functional
2020-12-13 02:29:29 -05:00
shellspeed1
3735efbfca
Ports construction bags
2020-11-29 18:29:03 -08:00
Artur
503d0156c6
Does the thing
2020-11-08 23:24:58 +02:00
silicons
ff46bfda10
Merge pull request #13547 from zeroisthebiggay/crepe
...
security fashion power crêpe but it's a sheath for your anime sword
2020-10-11 17:33:29 -07:00
DeltaFire
a5fce4b6ed
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
zerothebigboy
a8315a69e2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe
...
# Conflicts:
# icons/mob/clothing/belt.dmi
# icons/obj/clothing/belts.dmi
2020-10-11 01:19:18 -04:00
zerothebigboy
ef073167df
crepe
2020-10-10 21:39:45 -04:00
The0bserver
e40e4a79d3
Allows plantbags to hold plantdisks
2020-10-10 08:58:54 -04:00
The0bserver
98f398338a
belt fix and icons
2020-10-09 02:34:42 -04:00
The0bserver
0d1d94fd06
belt
2020-10-09 01:17:46 -04:00
DeltaFire
4146566af0
hoo boy
...
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
lolman360
0ff85deddf
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-08-25 01:25:34 +10:00
lolman360
bc14155632
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-08-23 17:01:45 +10:00
lolman360
1deafc7103
its asking me to commit hold on
2020-08-23 17:01:32 +10:00
lolman360
2a3ada511e
It's all codersprites?
...
Always has been.
2020-08-23 16:51:55 +10:00
Hatterhat
8645a2954f
tackle hando
2020-08-22 16:13:41 -05:00
silicons
120bcfc00c
Merge pull request #13178 from lolman360/plumb
...
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
lolman360
e00c383b1a
Update belt.dm
2020-08-18 20:19:54 +10:00
silicons
a900c07846
Merge branch '13163'
2020-08-16 18:51:24 -07:00
silicons
01dd2f389b
Merge branch 'pr-13067'
2020-08-16 18:38:13 -07:00
Detective Google
83e1b4f0df
woo yeah yeah woo
2020-08-14 15:07:22 -05:00
silicons
fb43e9a2d2
Merge pull request #13054 from KeRSedChaplain/zombies!
...
Improves zombies, the gimped threat
2020-08-09 05:42:31 -07:00
Hatterhat
6f754188ac
funny guns go pew
2020-08-07 18:02:33 -05:00
Dan-Neposh
9e62c7b7c3
Improves zombies, the gimped threat
...
Makes zombies take no stamina damage due to being a reanimated corpse, makes zombies not enter softcrit (but still hardcrit for the fake death thing), gives the romerol kit a guide on proper usage of the chem.
2020-08-06 22:43:15 -04:00
silicons
6876edbd85
Merge pull request #12992 from Hatterhat/rifle-book-pt2
...
unatomic as shit PR about nukie guns
2020-08-06 19:40:09 -07:00
Lin
ad4a96c73a
Merge pull request #13001 from Citadel-Station-13/silicons-patch-66
...
makes explosions only recurse one level into storage at full power before dropping 1 level per storage object recursed
2020-08-05 19:50:57 -05:00
silicons
bb8dfa9236
Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer
...
I wanna be tracer
2020-08-05 15:26:37 -07:00
Hatterhat
25ab96cf53
funny revolver reskins
2020-08-03 20:39:06 -05:00
Timothy Teakettle
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
silicons
d4d2e4ae0d
Update _storage.dm
2020-08-01 21:07:07 -07:00
CitadelStationBot
a2f6a7c207
Automatic changelog generation for PR #12979 [ci skip]
2020-08-01 00:16:53 -04:00
silicons
90d3cff53f
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 11:53:59 -07:00
Timothy Teakettle
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
silicons
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
silicons
9ff94e019b
Merge pull request #12924 from SiliconMain/analyzer
...
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
Lin
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
silicons
0152dcda65
fix
2020-07-28 13:24:45 -07:00
silicons
6c83beea02
Merge pull request #12937 from Ghommie/Ghommie-cit834
...
Fixing new bugs and stuff.
2020-07-28 10:46:17 -07:00
Ghommie
f1c242aadc
Fixing new bugs and stuff.
2020-07-27 14:16:01 +02:00
SiliconMain
abdafe15fa
fuck
2020-07-26 15:21:24 -05:00
Timothy Teakettle
75c40f6d93
what if wound values didnt suck
2020-07-26 18:51:19 +01:00
SiliconMain
1a78098885
on second thought
2020-07-26 05:20:53 -05:00
SiliconMain
54ed22d17d
ye
2020-07-26 05:19:56 -05:00
SiliconMain
d1c3465d77
Update belt.dm
2020-07-26 04:28:18 -05:00
