Thalpy
|
2256bbb63c
|
Merge branch 'master' into master
|
2019-08-07 09:30:53 +01:00 |
|
Ghommie
|
de8137d6c8
|
One line fix for invisible zipties.
|
2019-08-06 23:19:28 +02:00 |
|
Fermi
|
ee1b04eefb
|
Fixes potential "trapped as ghost" problems and examine+scanner text
|
2019-08-06 19:54:07 +01:00 |
|
deathride58
|
ddb29551fc
|
paren
|
2019-08-06 11:28:01 -04:00 |
|
deathride58
|
ee0d7a4ed3
|
Fixes issues with femur breaker by replacing the forced speech with a proper scream emote and making it guarantee landing in crit
|
2019-08-06 07:43:28 -04:00 |
|
Sishen
|
decbd37ced
|
Update closets.dm
|
2019-08-06 03:49:08 -04:00 |
|
Thalpy
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
kevinz000
|
aea2f6f523
|
Merge pull request #8900 from Seris02/spaceruinsyee
Abductor Replication Lab space ruin - take 2
|
2019-08-05 00:55:40 -07:00 |
|
kevinz000
|
9ec56077b6
|
Merge pull request #8908 from Ghommie/Ghommie-cit142
Fixes Zelus flasks a bit.
|
2019-08-05 00:54:43 -07:00 |
|
kevinz000
|
b292bc7187
|
Merge pull request #9007 from Ghommie/Ghommie-cit168
Fixes and standarizes sword sheaths/scabbards overlays.
|
2019-08-05 00:49:49 -07:00 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
kevinz000
|
c92e8b43bf
|
Merge pull request #9042 from EgoSumStultus/femur-breaker
[ THE FEMUR BREAKER ]
|
2019-08-04 22:27:42 -07:00 |
|
EgoSumStultus
|
5bfe4492a1
|
huhhh... huhu....
|
2019-08-04 22:15:10 -07:00 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
kevinz000
|
8452cf3b8a
|
Merge pull request #9014 from Ghommie/Ghommie-cit170
undergarment fixes.
|
2019-08-04 19:13:21 -07:00 |
|
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 |
|
Poojawa
|
7d65ddb417
|
bug blood, ipc/slime hearts, blood gen protolathe
we're all gucchi now boys
|
2019-08-04 04:07:44 -05:00 |
|
Poojawa
|
6db4cbf8b0
|
itsworking.avi
|
2019-08-04 01:32:51 -05: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 |
|
Poojawa
|
657d3528e2
|
some good work here
|
2019-08-01 17:35:37 -05:00 |
|
Poojawa
|
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 |
|
Fermi
|
18b03f9053
|
Furranium fixes.
|
2019-08-01 03:38:06 +01:00 |
|
Poojawa
|
3499d73f6b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
|
2019-07-31 19:24:39 -05: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 |
|