38c0f8efbd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-09-07 18:21:54 -03:00
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
16e0292270
fixed.
2020-09-06 20:41:35 +02:00
71aa5b9642
Emergent runtime issue.
2020-09-06 20:40:24 +02:00
20b25372e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-09-05 13:09:14 -03:00
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
05485c4b2c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-09-03 15:26:38 -03:00
dc9b024fae
Blemishes begone.
2020-09-02 19:16:16 +02:00
05bd0579ca
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-09-01 11:23:57 +10:00
c10471fac9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-30 01:42:29 -03:00
ae482c1bb8
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
6b096d80cc
eee o aaa
2020-08-25 18:55:57 +10:00
bd5848a0e3
Update recipes_misc.dm
2020-08-24 08:52:42 +10:00
289280f0ec
Update recipes_misc.dm
2020-08-24 00:00:39 +10:00
bc14155632
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-08-23 17:01:45 +10:00
1deafc7103
its asking me to commit hold on
2020-08-23 17:01:32 +10:00
2a3ada511e
It's all codersprites?
...
Always has been.
2020-08-23 16:51:55 +10:00
f759503b49
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-22 20:30:49 -03:00
c7c74e7c51
Merge pull request #13213 from lolman360/breath
...
breath mask balaclava
2020-08-22 15:22:04 -07:00
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
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
317480a3e7
something something skin texture revert. oh and oh fuck shit passkeys works again.
2020-08-22 15:07:02 +08:00
afe32406c0
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-22 13:40:36 +08:00
055d397e1e
adds tape
2020-08-21 13:34:02 -07:00
f04918bdca
working code?
2020-08-21 15:09:49 +08:00
b0662f5e39
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-21 02:19:20 -03:00
120bcfc00c
Merge pull request #13178 from lolman360/plumb
...
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
623fe1cb69
Update recipes_clothing.dm
2020-08-21 12:00:09 +10:00
bda2c740ba
Merge branch 'master' into AnPrimAssistants
2020-08-21 11:08:13 +10:00
fde859bca0
Removing priority overlays, update_icon() splitup for guns.
2020-08-20 18:33:23 +02:00
8d70e21239
the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it.
2020-08-20 19:40:47 +08:00
4259332cfd
e
2020-08-19 18:37:31 +10:00
7390effcb9
e
2020-08-18 19:09:01 +10:00
b466a5aae9
e
2020-08-18 18:57:23 +10:00
9931cb006c
eee
2020-08-18 17:33:20 +10:00
bd239b01b3
Update recipes_clothing.dm
2020-08-17 23:52:41 -07:00
bb86003510
w e w
2020-08-18 10:04:52 +10:00
06496434a4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-16 23:30:53 -03:00
7898f1fe3e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-16 23:24:11 -03:00
8dedcbcf76
Merge branch '13113'
2020-08-16 18:53:35 -07:00
2095e2705f
Merge branch '13169'
2020-08-16 18:52:13 -07:00
09fc795f3b
AnPrim
2020-08-17 11:45:24 +10:00
d287f44d9a
Merge pull request #13045 from silicons/coggers
...
ports bronze (fake clockwork) airlocks and windows
2020-08-16 20:20:03 -05:00
7c653d0891
i actually kinda like the idea that you need a point for paths.
...
- whoops actually increases stamdamage of mansus grasp to 60.
- ascensions bumped up to 5 each.
- recipe for a codex made a bit harder.
2020-08-16 04:34:04 -07:00
15a1ffde52
fix
2020-08-15 09:46:50 +08:00
aa46e355da
more more more.
...
- sacrifices give 2 charges now.
- books no longer contain a charge by default. (sorry gamerko, no easy ascensions while i sleep.)
- books are easier to craft.
2020-08-14 05:19:57 -07:00
6f7badda41
Merge branch 'master' into plumb
2020-08-12 09:03:11 +10:00
7929924d4a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-11 13:04:34 -03:00
740b4f3ecf
WHOOPS
2020-08-11 17:50:30 +10:00
6ec9a3c4bd
craftable plunger
2020-08-11 17:38:16 +10:00
Enric Gabriel