Commit Graph

3919 Commits

Author SHA1 Message Date
Hatterhat
bf273cffdd burnt bokken backsprite, wound tweak 2020-07-25 16:18:26 -05:00
Hatterhat
fa5fd08be3 parry tweaks 2020-07-25 15:37:21 -05:00
Timothy Teakettle
76016c75f9 yes 2020-07-25 21:27:32 +01:00
Hatterhat
b9ce2e497d bare wound bonus, wound malus 2020-07-25 13:10:35 -05:00
Hatterhat
f28c98590a lowered parry windows! attack verbs! 2020-07-25 13:03:15 -05:00
Hatterhat
eb6cb1151c i forgot the actual defining feature 2020-07-25 06:59:31 -05:00
silicons
d8a91d9ffa Update robot_upgrades.dm 2020-07-25 02:35:53 -07:00
silicons
0e1574bf77 sigh 2020-07-24 23:34:47 -07:00
Hatterhat
47d63296d0 slight buff? may be overreaching 2020-07-25 00:09:53 -05:00
timothyteakettle
47998153cd tweaks 2020-07-25 03:25:28 +01:00
Hatterhat
14fba6a056 funny parry sticks 2020-07-24 21:19:01 -05:00
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
Suicidalpickles
229500aa0e reverts extinguishers to altclick emptying
h
2020-07-24 16:00:36 -07:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Iatots
b6437a4ada Update code/game/objects/items/plushes.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-07-24 15:23:11 +02:00
Letter N
8e177bf01e another batch - MAJOR: teleportaiton, displaycase (ico port needed), 2020-07-24 19:58:48 +08:00
Iatots
ec2bd9b876 Update plushes.dm 2020-07-24 08:40:25 +02:00
Letter N
22d5aebaa5 second batch - MAJOR: mech_fab, turrets 2020-07-24 14:38:04 +08:00
timothyteakettle
5064c584cc woops typo 2020-07-24 03:01:40 +01:00
timothyteakettle
869474f4ec drop location is not suitable for structures 2020-07-24 03:01:12 +01:00
Iatots
b2a0d00eee Update plushes.dm 2020-07-23 21:13:41 +02:00
Iatots
80f2766314 Update plushes.dm 2020-07-23 20:11:29 +02:00
silicons
db24df58a0 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:36:46 -07:00
silicons
9f66163d4f Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20
Ports several food sprites/foods from Baystation/Citadel RP
2020-07-23 10:35:30 -07:00
silicons
ec72015f4f Merge pull request #12809 from BlackMajor/borgo
Gripper brained. The medborg can do chemistry now, oh no.
2020-07-23 10:35:16 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
lolman360
17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
lolman360
c07e5d544b wweeee 2020-07-22 11:27:26 +10:00
lolman360
661b9920fc luh mayo 2020-07-22 10:59:21 +10:00
lolman360
0f1aa3c0ca 'lolman? did you test your code?'
no i did not ms. kevinz
2020-07-22 10:49:56 +10:00
silicons
184e3992f3 fixes 2020-07-21 11:56:23 -07:00
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
3d2995b4e8 Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
2020-07-20 17:01:32 -07:00
silicons
7df369e5d7 Merge pull request #12811 from kappa-sama/patch-33
removes the 2 best weapons in the game from traitor uplink's 10tc surgery bag
2020-07-20 16:58:01 -07:00
silicons
9bb92f8d4d Merge pull request #12805 from SiliconMain/patch-1
This is stupid
2020-07-20 16:56:57 -07:00
silicons
947b050c47 Merge pull request #12804 from Arturlang/decal_painter_fix
Decal Painter ui fix
2020-07-20 16:55:38 -07:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
d43a5cae26 let's refactor attack_hand. 2020-07-20 11:19:20 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
Chiirno
64d5bd0030 switches around messages 2020-07-19 21:38:44 -03:00
BlackMajor
f265b85d3b Merge pull request #12810 from lolman360/master
service borg fix/tweak
2020-07-20 11:42:59 +12:00
Winter Flare
e416a2377e Merge branch 'master' into foodport-p2-7/12/20 2020-07-19 18:58:52 -04:00
Timothy Teakettle
1b99cb9201 everything has the bonesetter 2020-07-19 18:32:44 +01:00
Lin
b47872c079 Merge pull request #12802 from Citadel-Station-13/silicons-patch-31
fixes eshields not reflecting while active blocking uh oh
2020-07-19 11:12:32 -05:00
silicons
b1ccccb322 more 2020-07-18 18:51:16 -07:00
silicons
1a040dd2a6 changes 2020-07-18 18:44:17 -07:00
silicons
0b98b0409b sigh 2020-07-18 18:29:09 -07:00