Commit Graph

3173 Commits

Author SHA1 Message Date
silicons
4d7d068407 Update airlock.dm (#13182) 2020-08-23 21:01:26 +02: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
kiwedespars
055d397e1e adds tape 2020-08-21 13:34:02 -07: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
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
lolman360
4259332cfd e 2020-08-19 18:37:31 +10:00
Putnam
81dc6c7ee5 Ports reftracking from TG. 2020-08-18 20:41:43 -07:00
silicons
0331f0cdc3 Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum
Revert "[TESTMERGE ONLY] FUCK"
2020-08-18 18:52:52 -07: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
kiwedespars
bd239b01b3 Update recipes_clothing.dm 2020-08-17 23:52:41 -07:00
lolman360
3040032409 documentation updates 2020-08-18 15:42:19 +10:00
Putnam3145
23b4ba3714 Merge pull request #13063 from silicons/supermatter
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
2020-08-17 03:13:14 -07:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
ac7bdb5db5 Merge branch '13175' 2020-08-16 18:53:00 -07:00
silicons
2095e2705f Merge branch '13169' 2020-08-16 18:52:13 -07:00
silicons
b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
2020-08-16 20:20:03 -05:00
kiwedespars
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
zeroisthebiggay
167ff93675 Update space.dm
t e x t
2020-08-15 17:10:24 -04:00
zeroisthebiggay
730f18b239 Rename code/datums/ru to code/datums/ruins/space.dm
also im an rword
2020-08-15 17:07:51 -04:00
zeroisthebiggay
04055d34a2 Update and rename code/datums/ruins/space.dm to code/datums/ru
get it space bar
2020-08-15 16:31:17 -04:00
zerothebigboy
3bce862a28 a 2020-08-15 16:27:27 -04:00
zerothebigboy
d500052779 a 2020-08-15 16:27:17 -04:00
zerothebigboy
853604b218 a 2020-08-15 16:24:30 -04:00
zerothebigboy
a5cac7de3b a 2020-08-15 16:24:22 -04:00
Letter N
15a1ffde52 fix 2020-08-15 09:46:50 +08:00
kiwedespars
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
kiwedespars
bff11c4fe5 fixes, changes.
- buffed eldritch fluid
- readded patron's reach as a 1 point off from aggressive spread
- buffed amount of ghouls flesh can have.
- buffed the stam regen of rust a little bit.
- fixed sacrifices not giving points if they were in your pockets (thanks to tgstation/tgstation#51648)
- removal of heretic status no longer gives a loud deconvert message (thanks to tgstation/tgstation#52629)
- description fixes, eldritch amulet now works.
2020-08-13 01:12:10 -07:00
lolman360
6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
Timothy Teakettle
4a2bbe66d6 Merge branch 'master' into cum 2020-08-11 18:30:30 +01:00
lolman360
740b4f3ecf WHOOPS 2020-08-11 17:50:30 +10:00
lolman360
6ec9a3c4bd craftable plunger 2020-08-11 17:38:16 +10:00
kiwedespars
3bd2f73449 travis 2020-08-10 21:37:50 -07:00
timothyteakettle
1f240b883f holy shit 2020-08-11 03:37:04 +01:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Timothy Teakettle
033fe553e8 cease your shitcode 2020-08-10 21:41:06 +01:00
lolman360
d9c198825b linter 2: 2020-08-10 10:29:17 +10:00
chrisbbbbbbb
758d540c9e Suture/Mesh Crafting 2020-08-09 20:33:40 +02:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons
d25daec117 Merge pull request #13081 from Putnam3145/ethereals
Ports ethereals from TG
2020-08-09 05:39:43 -07:00
silicons
d9764bf5ea Merge pull request #13066 from timothyteakettle/make-speech-verbs-dna-based
speech verbs now copy through dna copying
2020-08-09 05:37:08 -07:00
silicons
3acd4ac6de Merge pull request #13069 from Chiirno/radioactive-port
Ports TG #51879 - Makes rads glow, buffs rad goggles
2020-08-09 05:35:08 -07:00