50ea3970f6
huhuhuhuguhuuhh...
2019-08-02 09:25:38 -07:00
45655c65f3
HUHUUGGUUHUHHUHUHHhhh...
2019-08-02 08:32:49 -07:00
7f3e5ad3d0
AAUUGUGGHHHGHUGHUGHHH!!
2019-08-02 08:07:00 -07:00
6b72e04708
HUFF HUFF HUFf...
2019-08-02 07:38:40 -07:00
5814ab7e8f
BRRREEEEEEEEEEEEEEEEEEEEE
2019-08-02 06:23:02 -07: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
1893a8f319
correctly copy/pasta's the chaplain stuff
2019-08-01 11:14:50 -05:00
ec90505881
neyh
2019-08-01 11:06:03 -05:00
c8d7f1909d
holy FUCK I got gib overlays working. Why wasn't it before?
...
No one will ever know.
2019-08-01 00:58:24 -05:00
5ee9b4d4f4
part 1 plasmaman stuff.
2019-08-01 06:58:21 +02:00
397b33f0b2
Fixes a bug no one here will ever run into
2019-07-31 21:00:45 -07: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
218cbe2dbc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-31 19:09:35 -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
397c62bf7a
undergarment fixes.
2019-07-31 16:19:25 +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
2252b81798
Merge pull request #8964 from Trilbyspaceclone/patch-197
...
Makes steal a few steal objectives better worded and role restricted better
2019-07-29 04:42:20 -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
624d74f500
Merge pull request #8965 from Trilbyspaceclone/patch-198
...
Ports "Security can access gulag equipment reclaimer #45298 "
2019-07-29 04:40:01 -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
7b7f4f8042
Merge pull request #8795 from Sishen1542/emp-rebalance
...
Buffs tracking beacon EMPs, and makes EMP damage temporarily disable mech equipment
2019-07-29 04:32:51 -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
7b681f4129
Fixes jogging on wet tiles actually slipping you if you have less than 20 stamloss.
2019-07-28 19:35:53 +02: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
8c63ea7b6d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-26 17:36:46 -05:00
68083aa0c6
a
2019-07-25 21:43:02 -04:00
8563af71b3
Update security.dm
2019-07-25 21:43:02 -04:00
612021b9d5
h
2019-07-25 21:43:02 -04:00
EgoSumStultus