aea2f6f523
Merge pull request #8900 from Seris02/spaceruinsyee
...
Abductor Replication Lab space ruin - take 2
2019-08-05 00:55:40 -07:00
9ec56077b6
Merge pull request #8908 from Ghommie/Ghommie-cit142
...
Fixes Zelus flasks a bit.
2019-08-05 00:54:43 -07:00
b292bc7187
Merge pull request #9007 from Ghommie/Ghommie-cit168
...
Fixes and standarizes sword sheaths/scabbards overlays.
2019-08-05 00:49:49 -07:00
86a2d917e5
Merge pull request #8913 from Trilbyspaceclone/clockstoles
...
Makes brass/bronze bar stools and stools - Same as normal ones
2019-08-05 00:45:56 -07:00
9852084200
Merge pull request #9019 from Ghommie/Ghommie-cit172
...
Adds in a stereotypical vegetarian MRE. Tweaks the rest.
2019-08-05 00:44:15 -07:00
f1c9a07f6d
Merge pull request #8912 from Ghommie/Ghommie-cit146
...
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
489b4c78dc
Merge pull request #8996 from Ghommie/Ghommie-cit166
...
Adds in worn overlays for different types of cuffs.
2019-08-04 19:19:19 -07:00
7a3d895997
Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes
...
Tweaks cakes, adds in more of them as well as a few more tarts - All hidden
2019-08-04 19:15:18 -07:00
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
6db4cbf8b0
itsworking.avi
2019-08-04 01:32:51 -05:00
f9d829b111
Proc to define
2019-08-04 05:48:08 +01:00
46e4023ba9
Monkey business
2019-08-04 05:07:24 +01:00
3a85f9473c
amazing
2019-08-02 14:37:52 -04:00
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
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
657d3528e2
some good work here
2019-08-01 17:35:37 -05:00
18b03f9053
Furranium fixes.
2019-08-01 03:38:06 +01:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
6dd92ce122
.
2019-07-31 21:26:59 +02:00
1639a7002a
Adds in a stereotypical vegetarian MRE. Tweaks the rest.
2019-07-31 21:02:12 +02:00
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
bbb380e043
Update medical.dm
2019-07-31 09:03:27 -04:00
16afae1e14
boolean
2019-07-31 03:06:20 +02:00
991e4e8d41
Fixes and standarizes sword sheaths/scabbards overlays.
2019-07-31 02:43:40 +02:00
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
94fa4aa6d5
Merge branch 'master' into Rapid-Resprite-Service
2019-07-29 21:15:46 +08:00
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
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
8477a524ae
Merge pull request #8978 from YakumoChen/cardbored
...
Removes stealth implant box integrity
2019-07-29 04:38:42 -07:00
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
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
7ca32cd97f
port 2
2019-07-29 07:28:38 -04:00
606639ce23
part 1 fixing shit
2019-07-29 05:52:49 -04:00
4ef1413342
dupe icons instead of snowflake vars.
2019-07-29 04:50:12 +02:00
2b224400e3
Adds in worn overlays for different types of cuffs.
2019-07-29 04:31:27 +02:00
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
31709938c6
Pushing a buncha stuff so I can fix things.
2019-07-28 23:23:45 +01:00
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
223aa33b07
mind check
2019-07-28 04:43:06 -07:00
a9e1fadcd4
allows the captain sabre sheat to hold stunswords.
2019-07-27 22:47:36 +02:00
0a560b171c
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
2019-07-27 13:01:27 +02:00
06d9dd8a52
!
...
Box no longer a damage sponge, deletes in one hit
2019-07-26 23:55:43 +00:00
72413c893f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
2019-07-27 01:38:20 +02:00
f4c2f1d8bc
Merge pull request #8952 from CdrCross/robust-cloner
...
Cloning console board memory
2019-07-25 17:45:50 -07:00
b20d9ef21c
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into RLD-fix
2019-07-25 04:57:18 -05:00
3dabf3c42f
Fixes RLD overlays, adds cable color to RCL sprites
2019-07-25 04:50:40 -05:00
6c712a6931
Implementing nerfs.
2019-07-24 17:58:24 +02:00
969aaad3d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-07-24 17:35:29 +02:00
aac71758b7
Cloning console board memory
...
Makes the cloning console circuit board have local memory of the records of the console.
2019-07-23 14:25:03 +02:00
2845cb2e7d
Resprites RCDs and RPDs
2019-07-23 20:23:45 +08:00
kevinz000