Commit Graph

2900 Commits

Author SHA1 Message Date
kevinz000
4dcdf7ac4d Merge pull request #9044 from Sishen1542/rock-lock
Adds the ability to construct and deconstruct locker locks
2019-08-04 19:07:35 -07:00
kevinz000
27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
Chayse Ramsay
f9d829b111 Proc to define 2019-08-04 05:48:08 +01:00
Chayse Ramsay
46e4023ba9 Monkey business 2019-08-04 05:07:24 +01:00
Sishen
1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
EgoSumStultus
464a589c25 *sobbing noises* 2019-08-03 07:34:32 -07:00
EgoSumStultus
b3b8d71cc7 huuhuh... HUUuhuhuhh.... 2019-08-02 22:41:01 -07:00
EgoSumStultus
b208a475ef huuhhuuhuhh.... 2019-08-02 21:37:56 -07:00
TrilbySpaceClone
3a85f9473c amazing 2019-08-02 14:37:52 -04:00
EgoSumStultus
50ea3970f6 huhuhuhuguhuuhh... 2019-08-02 09:25:38 -07:00
EgoSumStultus
45655c65f3 HUHUUGGUUHUHHUHUHHhhh... 2019-08-02 08:32:49 -07:00
EgoSumStultus
7f3e5ad3d0 AAUUGUGGHHHGHUGHUGHHH!! 2019-08-02 08:07:00 -07:00
EgoSumStultus
6b72e04708 HUFF HUFF HUFf... 2019-08-02 07:38:40 -07:00
EgoSumStultus
5814ab7e8f BRRREEEEEEEEEEEEEEEEEEEEE 2019-08-02 06:23:02 -07:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
2019-08-02 00:57:05 -07:00
kevinz000
dba6a25b15 Merge pull request #9011 from Trilbyspaceclone/patch-201
Ports "Gauze can now be applied to corpses #44199"
2019-08-02 00:54:57 -07:00
Fermi
18b03f9053 Furranium fixes. 2019-08-01 03:38:06 +01:00
Ghommie
6dd92ce122 . 2019-07-31 21:26:59 +02:00
Ghommie
1639a7002a Adds in a stereotypical vegetarian MRE. Tweaks the rest. 2019-07-31 21:02:12 +02:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Ghommie
397c62bf7a undergarment fixes. 2019-07-31 16:19:25 +02:00
Trilbyspaceclone
bbb380e043 Update medical.dm 2019-07-31 09:03:27 -04:00
Ghommie
16afae1e14 boolean 2019-07-31 03:06:20 +02:00
Ghommie
991e4e8d41 Fixes and standarizes sword sheaths/scabbards overlays. 2019-07-31 02:43:40 +02:00
Fermi
fbbc4d8589 Merge branch 'pr/21' 2019-07-29 22:57:40 +01:00
Michiyamenotehifunana
94fa4aa6d5 Merge branch 'master' into Rapid-Resprite-Service 2019-07-29 21:15:46 +08:00
kevinz000
e55563d058 Merge pull request #8990 from EgoSumStultus/his-grace-mindless-mob-fix
Mobs eaten by His Grace now require a mind attached to count for ascension
2019-07-29 04:47:44 -07:00
kevinz000
a95fff589c Merge pull request #8966 from Poojawa/RLD-fix
Gives RLD adaptive overlays, adds cable color to RCL sprites
2019-07-29 04:41:07 -07:00
kevinz000
8477a524ae Merge pull request #8978 from YakumoChen/cardbored
Removes stealth implant box integrity
2019-07-29 04:38:42 -07:00
kevinz000
2c3e46bbb9 Merge pull request #8982 from Ghommie/Ghommie-cit160
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
2019-07-29 04:37:36 -07:00
kevinz000
156d525897 Merge pull request #8984 from Ghommie/Ghommie-cit162
allows the captain sabre sheat to hold stunswords.
2019-07-29 04:37:21 -07:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
TrilbySpaceClone
606639ce23 part 1 fixing shit 2019-07-29 05:52:49 -04:00
Ghommie
4ef1413342 dupe icons instead of snowflake vars. 2019-07-29 04:50:12 +02:00
Ghommie
2b224400e3 Adds in worn overlays for different types of cuffs. 2019-07-29 04:31:27 +02:00
Fermi
d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
Fermi
31709938c6 Pushing a buncha stuff so I can fix things. 2019-07-28 23:23:45 +01:00
Chayse Ramsay
5055cd73b9 Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains.
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
2019-07-28 17:31:59 +01:00
EgoSumStultus
223aa33b07 mind check 2019-07-28 04:43:06 -07:00
Ghommie
a9e1fadcd4 allows the captain sabre sheat to hold stunswords. 2019-07-27 22:47:36 +02:00
Ghommie
0a560b171c [s] ports "Fixes ore satchel exploits, various storage size circumventions." 2019-07-27 13:01:27 +02:00
YakumoChen
06d9dd8a52 !
Box no longer a damage sponge, deletes in one hit
2019-07-26 23:55:43 +00:00
Sishen
68083aa0c6 a 2019-07-25 21:43:02 -04:00
Sishen
8563af71b3 Update security.dm 2019-07-25 21:43:02 -04:00
Sishen
612021b9d5 h 2019-07-25 21:43:02 -04:00
kevinz000
f4c2f1d8bc Merge pull request #8952 from CdrCross/robust-cloner
Cloning console board memory
2019-07-25 17:45:50 -07:00
Thalpy
123c9199ba Added Eigenlockers. I love them. 2019-07-25 20:51:09 +01:00
Poojawa
b20d9ef21c Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into RLD-fix 2019-07-25 04:57:18 -05:00
Poojawa
3dabf3c42f Fixes RLD overlays, adds cable color to RCL sprites 2019-07-25 04:50:40 -05:00
Ghommie
6c712a6931 Implementing nerfs. 2019-07-24 17:58:24 +02:00