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
kevinz000
f07cdc0665
Merge pull request #9177 from JTGSZ/fix
...
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
2019-08-26 19:42:15 -07:00
kevinz000
78c1ad972f
Merge pull request #9179 from chefferz/master
...
Gives His Grace stamina regeneration
2019-08-26 19:39:46 -07:00
kevinz000
37642cdac2
Merge pull request #9194 from kappa-sama/kappa-sama-keys
...
Wallets can now hold vehicle keys.
2019-08-26 19:37:28 -07:00
kevinz000
96278b45ad
Merge pull request #9183 from Ghommie/Ghommie-cit187
...
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-26 19:36:06 -07:00
kevinz000
c069e76304
Merge pull request #9181 from Linzolle/general-swordsky
...
[SPEEDMERGE] fixes sword exploit and secbot construction
2019-08-26 19:35:51 -07:00
Trilbyspaceclone
ce28e71cd3
2 free ones for anyone that wants them
2019-08-26 17:08:48 -04:00
Tupinambis
d43b4599ef
I was bullied to reduce click delay.
2019-08-26 15:53:44 -05:00
Tupinambis
13638ed5d6
Reverts some changes I deemed unneccesary. Undoes a fuckup
2019-08-26 15:08:36 -05:00
TrilbySpaceClone
00c01709b2
moves banners into crafting
2019-08-26 15:46:41 -04:00
Poojawa
bd49187ea7
on second thought, let's not try to half ass fancy ideas.
2019-08-26 14:45:36 -05:00
Tupinambis
a4fd2be7f7
Various Shotgun Nerfs.
2019-08-26 14:45:12 -05:00
Poojawa
74a24fdcc1
WHAT IN TARNATION
2019-08-26 14:30:27 -05:00
Poojawa
9558252b93
Revert/replaces a lot of #8024 with bleed_rate
...
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood. Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05:00
Poojawa
bdae9e051b
Fixes some errant issues with overlays
2019-08-26 14:15:55 -05:00
Poojawa
d7ec568efc
Allows xeno weeds to regenerate lost blood
...
Honestly this should have been a thing since forever ago but whatever.
2019-08-26 09:08:00 -05:00
TrilbySpaceClone
44893b6ee7
It just works
2019-08-26 06:32:54 -04:00
Dap
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
kevinz000
d64e5b29fd
Update reactions.dm
2019-08-25 15:59:45 -07:00
Sishen
b093439c73
aaaaaaaa
2019-08-25 16:27:02 -04:00
