Commit Graph

3076 Commits

Author SHA1 Message Date
silicons
cd0a0bbe5c Update healing.dm 2021-05-06 03:02:46 -07:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
Artur
35bfba1f6a Redoes the variable changes into procs 2021-05-05 18:15:13 +03:00
Artur
92e6646a4c time to make blood even more pain 2021-05-05 14:44:21 +03:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
d32770a0fa test 2021-05-02 22:19:41 +01:00
silicons
cb0574a560 Merge pull request #14649 from TheObserver-sys/BulletPass
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
2021-04-28 21:17:55 -06:00
The0bserver
87eee1e15e Why do I do this to myself at 2:22 AM 2021-04-24 02:22:43 -04:00
The0bserver
00f50713eb The fault in my stars 2021-04-24 02:04:21 -04:00
The0bserver
42ed17d2af this too 2021-04-24 00:54:56 -04:00
The0bserver
c7b231637e boxes of ammo, also fire not weapon is bullet 2021-04-24 00:53:57 -04:00
The0bserver
aebca1767e In a station full of bad ideas, these costs were.. 2021-04-23 23:20:16 -04:00
necromanceranne
0a5b587304 Adds fake blindfolds. For reasons. 2021-04-21 12:06:34 +10:00
Blue Wildrose
a7726aa383 re-enlarging the value 2021-04-01 06:07:25 -07:00
Blue Wildrose
e7099c67a1 oh right some fucker at cargo would abuse this. 2021-04-01 05:45:26 -07:00
silicons
b2151ea989 Merge pull request #14501 from Shadow-Quill/RunIconFix
Adds small walk hud icons
2021-03-27 01:34:47 -06:00
silicons
4f631c29bb Merge pull request #14504 from zeroisthebiggay/tritails
i hate kitsune players so here i am porting triple kitsune tails from VORE fuck you
2021-03-27 01:34:23 -06:00
silicons
d58697c78d Merge pull request #14505 from timothyteakettle/the-most-important-pr
the loadout now recognises collars as polychromic items
2021-03-24 19:23:58 -06:00
Timothy Teakettle
7d4284b086 Update neck.dm 2021-03-23 21:33:50 +00:00
zerothebigboy
f600e51408 i hate kitsune players so i hope you appreciate me adding more cringe to your arsenal 2021-03-23 15:50:13 -04:00
Shadow Quill
89fdeb65c5 Adds small walk hud icons 2021-03-23 01:38:45 -05:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
silicons
7bd2727d58 Merge pull request #14458 from GrayRachnid/particle-defender
Buffs the Warden's Particle defender to something that isn't pure dumpster trash
2021-03-20 14:28:26 -06:00
ItzGabby
68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00
ItzGabby
3fed89b16d fixthedamnballs 2021-03-19 02:01:37 -04:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
silicons
f6f2c27e90 Merge pull request #14442 from SandPoot/master
Adds the skirt variant of the "Tactitool Turtleneck" to the loadout
2021-03-18 06:40:51 -06:00
silicons
e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
GrayRachnid
1f668a0473 lowers number of shots back to 8 from 10 2021-03-17 14:11:50 -04:00
GrayRachnid
679d00f787 rebalances after further testing 2021-03-17 13:48:21 -04:00
GrayRachnid
508210e3ec buffs particle defender 2021-03-17 13:01:49 -04:00
SandPoot
5d13d61ea7 upload files 2021-03-15 11:11:17 -03:00
Jay
e4ab673e4a Adds Shrine Maiden outfit for donator 2021-03-14 18:40:01 -05:00
kiwedespars
69d927e756 Merge branch 'master' into void-but-for-real 2021-03-12 23:10:19 -08:00
kiwedespars
56b0a49902 brain is like monkey, it forgets the newlines 2021-03-11 21:32:11 -08:00
kiwedespars
e145bdafe8 adds domain expansion
- adds domain expansion, final spell for void heretics
- makes clap1 into an emote
- makes cleave a little more enticing with two guaranteed critical wounds and brute damage
- buffs void mark
2021-03-11 21:26:58 -08:00
silicons
cc6af1e8f1 Merge pull request #14401 from Hatterhat/tailfix
[@silicons wake up bro] eikobiko tail sprite but in the correct .dmi
2021-03-10 13:51:41 -07:00
Hatterhat
2dc51f3a52 oops! all wrong .dmis! 2021-03-10 08:49:56 -06:00
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07:00
Lin
195d05b051 Merge pull request #14343 from Hatterhat/thanks-jay
no more nt chokers society has progressed past the need for nt chokers
2021-03-02 15:09:39 -06:00
Hatterhat
28833b67b8 you guys are not gonna fucking believe this 2021-02-28 21:09:41 -06:00
Letter N
573f86e223 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-28 09:07:35 +08:00
Detective Google
0d2eef3cc4 for everyone 2021-02-27 04:45:23 -06:00
Detective Google
2ae258d002 turtlenecks 2021-02-27 04:42:05 -06:00
Letter N
59990abd25 grr 2021-02-27 08:41:54 +08:00
dzahlus
b2b8534edc im fucking retarded thinking that was balanced 2021-02-24 18:50:12 +01:00
Letter N
5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Lin
5517678780 Merge pull request #14286 from Citadel-Station-13/metalmaskDonator
Donator Item - Metal Mask
2021-02-22 11:15:37 -06:00
Jay
73be04412b Donator Item - Metal Mask 2021-02-21 19:57:43 -06:00
silicons
f581d8c8e0 Merge pull request #14264 from dzahlus/pain-emote-updates
Pain emote is now added to getting wounded! As well as more pain sounds
2021-02-21 14:56:26 -07:00