Putnam3145
9d300ade35
Merge pull request #13677 from silicons/newlines
...
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
DeltaFire
185c8929b0
Merge remote-tracking branch 'upstream/master' into supplypod-shrapnel
2020-11-16 04:29:43 +01:00
silicons
9d7226cb4d
Merge pull request #13670 from shellspeed1/master
...
Makes floor bots buildable with all toolboxes.
2020-11-15 17:12:37 -07:00
DeltaFire
e0b2156142
fixes fixes fixes
2020-11-14 19:26:54 +01:00
DeltaFire
a0fac5924f
e
...
I want my warcrime supply pods to work and not runtime
2020-11-14 18:00:25 +01:00
silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
shellspeed1
7a0c0a0e04
You can now build floor bots with any toolbox
2020-11-09 21:24:45 -08:00
Timothy Teakettle
46dbb9345d
slime puddles look better and cant be abused by lings ( #13567 )
...
* perfect
* further changes
* no squeaking please
* no more squeaking damnit
* no more squeaking damnit
* slower
* they get broken armor
* broken armor application
* Apply suggestions from code review
* add a comma
* make crossed work properly
* Update squeak.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-11-01 21:40:58 +01:00
kappa-sama
aa696edd84
this
2020-10-20 19:39:23 -04:00
silicons
f16343d726
Update squeak.dm
2020-10-16 20:48:11 -07:00
DeltaFire
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
silicons
ad32b8f437
Merge pull request #13472 from timothyteakettle/slime-puddle
...
the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
silicons
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02: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
timothyteakettle
418cd44bbe
SQUISH
2020-10-02 16:31:33 +01:00
Ghom
fb95d873aa
Merge pull request #13383 from Citadel-Station-13/silicons-patch-37
...
fixes bomb component allowing pickup
2020-10-01 11:42:21 +02:00
silicons
9c58dbf2c5
Update killerqueen.dm
2020-09-10 12:00:17 -07:00
silicons
4f4b849b23
Update killerqueen.dm
2020-09-08 20:52:28 -07:00
silicons
2fdcfa4f07
Update killerqueen.dm
2020-09-08 20:50:06 -07:00
silicons
07b28f40de
Merge pull request #13359 from Ghommie/Ghommie-cit838
...
Turf visuals fix plus corrected names of a couple things.
2020-09-07 13:42:05 -07:00
Ghommie
16e0292270
fixed.
2020-09-06 20:41:35 +02:00
Ghommie
71aa5b9642
Emergent runtime issue.
2020-09-06 20:40:24 +02: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
Ghommie
dc9b024fae
Blemishes begone.
2020-09-02 19:16:16 +02:00
lolman360
05bd0579ca
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-09-01 11:23:57 +10:00
Letter N
ae482c1bb8
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
lolman360
6b096d80cc
eee o aaa
2020-08-25 18:55:57 +10:00
lolman360
bd5848a0e3
Update recipes_misc.dm
2020-08-24 08:52:42 +10:00
lolman360
289280f0ec
Update recipes_misc.dm
2020-08-24 00:00:39 +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
silicons
c7c74e7c51
Merge pull request #13213 from lolman360/breath
...
breath mask balaclava
2020-08-22 15:22:04 -07:00
silicons
876dc36dbc
Merge pull request #13201 from kiwedespars/return-the-punch
...
makes it so you can craft armwraps roundstart again.
2020-08-22 15:21:22 -07:00
silicons
7737e76b32
Merge pull request #13224 from Ghommie/Ghommie-cit835
...
Removing priority overlays, update_icon() splitup for guns.
2020-08-22 15:19:07 -07:00
Letter N
317480a3e7
something something skin texture revert. oh and oh fuck shit passkeys works again.
2020-08-22 15:07:02 +08:00
Letter N
afe32406c0
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-22 13:40:36 +08:00
kiwedespars
055d397e1e
adds tape
2020-08-21 13:34:02 -07:00
Letter N
f04918bdca
working code?
2020-08-21 15:09:49 +08: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
623fe1cb69
Update recipes_clothing.dm
2020-08-21 12:00:09 +10:00
lolman360
bda2c740ba
Merge branch 'master' into AnPrimAssistants
2020-08-21 11:08:13 +10:00
Ghommie
fde859bca0
Removing priority overlays, update_icon() splitup for guns.
2020-08-20 18:33:23 +02:00
Letter N
8d70e21239
the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it.
2020-08-20 19:40:47 +08:00
lolman360
4259332cfd
e
2020-08-19 18:37:31 +10:00
lolman360
7390effcb9
e
2020-08-18 19:09:01 +10:00
lolman360
b466a5aae9
e
2020-08-18 18:57:23 +10:00
lolman360
9931cb006c
eee
2020-08-18 17:33:20 +10:00
