Poojawa
|
b2252a1c74
|
Medical assistance treats bleed_rate to stop phantom bleeding
|
2019-08-30 02:46:57 -05:00 |
|
kevinz000
|
931527ff7c
|
Update mob.dm
|
2019-08-29 22:54:41 -07:00 |
|
Poojawa
|
dae3e91293
|
MIGHT HELP IF SYNTHETICS EXISTED, WHOOPS
|
2019-08-30 00:07:06 -05:00 |
|
Poojawa
|
dca90db321
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-29 23:03:26 -05:00 |
|
Poojawa
|
a0412933c0
|
Blood Generator QOL, put in hands, select slot to add bloodbag to
|
2019-08-29 23:02:41 -05:00 |
|
TrilbySpaceClone
|
ea7235d089
|
Merge branch 'master' into fruit
|
2019-08-29 21:15:18 -04:00 |
|
Trilbyspaceclone
|
1256d9382e
|
complie
|
2019-08-29 21:07:57 -04:00 |
|
nik707
|
2307f7a2a6
|
Merge pull request #9146 from Raptorizer/Botany-Peaches
New plant type: Peaches
|
2019-08-29 19:59:37 -05:00 |
|
nik707
|
1132b75392
|
Merge pull request #9173 from Citadel-Station-13/kevinz000-patch-76
Removes duplicate definition of games and toys nodes and readds autoylathe
|
2019-08-29 19:53:37 -05:00 |
|
Trilbyspaceclone
|
c641874aab
|
Update unsorted.dm
|
2019-08-29 20:50:36 -04:00 |
|
nik707
|
e7b267254b
|
Merge pull request #9200 from Owai-Seek/minor-fixes
Fixes Strawberries
|
2019-08-29 19:34:09 -05:00 |
|
nik707
|
bff828d3be
|
Merge pull request #9202 from Trilbyspaceclone/patch-216
Ports "Fixes wallets #510" From KeplerStation
|
2019-08-29 19:33:08 -05:00 |
|
nik707
|
fccafd6bd9
|
Merge pull request #9204 from Trilbyspaceclone/patch-217
Fixes katana's being cursed when not cursed
|
2019-08-29 19:31:40 -05:00 |
|
nik707
|
01f732c57a
|
Merge pull request #9207 from Ghommie/Ghommie-cit189
Rawket lawnchair fix.
|
2019-08-29 19:29:14 -05:00 |
|
nik707
|
36a07f134b
|
Merge pull request #9208 from Ghommie/Ghommie-cit190
Socks uncolorability fix.
|
2019-08-29 19:28:01 -05:00 |
|
nik707
|
624d717d08
|
Merge pull request #9168 from Seris02/loochotkey
Adds looc hotkey - on examination, just makes it better
|
2019-08-29 19:11:57 -05:00 |
|
nik707
|
121c2c2f53
|
Merge pull request #9172 from Citadel-Station-13/kevinz000-patch-75
You rack the riot shotgun
|
2019-08-29 19:11:19 -05:00 |
|
nik707
|
fd2aec7efe
|
Merge pull request #9171 from Citadel-Station-13/kevinz000-patch-74
Fixes and optimizes ghost swords
|
2019-08-29 19:09:40 -05:00 |
|
nik707
|
4f9b901a97
|
Merge pull request #9158 from Citadel-Station-13/kevinz000-patch-73
Rebalances the MASONrig
|
2019-08-29 19:06:04 -05:00 |
|
TrilbySpaceClone
|
d3852ebd56
|
even more
|
2019-08-29 19:39:10 -04:00 |
|
nik707
|
bfd17d66cd
|
Merge pull request #9074 from Citadel-Station-13/donator_grouping
Donator grouping system
|
2019-08-29 18:31:23 -05:00 |
|
nik707
|
2f7402f591
|
Merge pull request #9184 from Ghommie/Ghommie-cit188
Removes an obnoxious temporary overlay var.
|
2019-08-29 18:19:44 -05:00 |
|
Ghommie
|
2a7b802957
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-08-29 21:01:23 +02:00 |
|
Sishen
|
b98a5016b3
|
aaaaaaaaaaaa
|
2019-08-29 01:56:52 -04:00 |
|
Sishen
|
07a2d19c34
|
Update supermatter.dm
|
2019-08-28 23:58:27 -04:00 |
|
Sishen
|
47ee3a8a6d
|
fuck
|
2019-08-28 23:56:08 -04:00 |
|
TrilbySpaceClone
|
d37cb76f42
|
part 3
|
2019-08-28 21:18:51 -04:00 |
|
TrilbySpaceClone
|
0e5ddc88c1
|
Part 2
bounty nerfs
|
2019-08-28 19:51:07 -04:00 |
|
Fermi
|
c1d9e3f03b
|
Failing is frustrating
|
2019-08-29 00:37:18 +01:00 |
|
Fermi
|
a5b8a56f9a
|
Realised it was impossible.
|
2019-08-29 00:32:05 +01:00 |
|
Fermi
|
5b144ef1c6
|
Removed unused var
|
2019-08-29 00:13:24 +01:00 |
|
Fermi
|
124d8503dc
|
Tests and fixes.
|
2019-08-29 00:12:16 +01:00 |
|
Dap
|
19678119c5
|
Merge branch 'plasmatables' into plasmaglass-tables-spears
|
2019-08-28 14:55:01 -06:00 |
|
TrilbySpaceClone
|
f0a1d44503
|
Part 1
The food brake
|
2019-08-28 16:54:10 -04:00 |
|
nik707
|
9a0b6a21f9
|
Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64
Amber alert ERTs no longer get pulse weapons
|
2019-08-28 13:05:56 -05:00 |
|
Sishen
|
c664032e85
|
Update supermatter.dm
|
2019-08-28 02:23:24 -04:00 |
|
nik707
|
8e40e9d887
|
Merge pull request #9186 from Sishen1542/walklikeanegyptian
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
|
2019-08-28 00:02:39 -05:00 |
|
kevinz000
|
bea4349056
|
Merge pull request #9180 from deathride58/buffspoly
grants poly the ability to automatically speak through the TGS relay (with a 0.01% chance)
|
2019-08-27 20:50:59 -07:00 |
|
Ghommie
|
0ffeb704af
|
Socks color fix.
|
2019-08-28 05:33:36 +02:00 |
|
Ghommie
|
18b023b127
|
arg
|
2019-08-28 04:47:53 +02:00 |
|
BlackMajor
|
4d6b9f5da1
|
Merge pull request #8537 from Ghommie/Ghommie-cit28
Fixes emags wasting charges on un-emaggable stuff.
|
2019-08-28 13:54:03 +12:00 |
|
Ghommie
|
e25697dc14
|
rocket fix.
|
2019-08-28 03:37:35 +02:00 |
|
Tupinambis
|
3b2be43bd8
|
Slightly increased rubbershot damage from 12.5 to 15 per pellet.
|
2019-08-27 18:35:08 -05:00 |
|
Trilbyspaceclone
|
6cf4783486
|
fixed
|
2019-08-27 13:56:47 -04:00 |
|
TrilbySpaceClone
|
419ea7f58c
|
Fancy_part1
|
2019-08-27 12:41:47 -04:00 |
|
Trilbyspaceclone
|
77863119f2
|
Update wallets.dm
|
2019-08-27 11:31:52 -04:00 |
|
Poojawa
|
5b4347c5ab
|
Initial commit.
needs to be added alongside all med_hud_set_status and tested to even fukkin' work.
|
2019-08-27 04:30:31 -05:00 |
|
Winter Flare
|
26c5aa6185
|
Update berries.dm
Actually fixes strawberries so they have visible growth stages and death icons.
|
2019-08-27 03:47:56 -04:00 |
|
Poojawa
|
fd16520ac0
|
buffs toxinlover blood deletion penalty
|
2019-08-27 02:42:45 -05:00 |
|
kevinz000
|
1e6845491d
|
Update mood.dm
|
2019-08-26 19:54:34 -07:00 |
|