 Artur
|
82ccfc40dc
|
/obj/screen --> /atom/movable/screen
|
2021-07-29 13:57:19 +03:00 |
|
|
silicons
|
3070f178e0
|
Merge remote-tracking branch 'citadel/master' into combat_patches_1
|
2021-07-18 15:12:52 -07:00 |
|
|
WanderingFox95andGitHub
|
e36448b9ed
|
ONE PIXEL AAA
|
2021-07-03 16:46:19 +02:00 |
|
|
siliconsandGitHub
|
831a13a7b6
|
Merge pull request #14906 from WanderingFox95/WanderingFox95-LotlEarFix
[Very Ready] Axolotl Ear [Fix]
|
2021-07-01 21:57:35 -07:00 |
|
|
silicons
|
8710731b87
|
tweaks
|
2021-07-01 20:42:55 -07:00 |
|
|
WanderingFox95andGitHub
|
9c1fa24331
|
Changed the name of the axolotl ear sprite
cause it won't show up otherwise.
|
2021-06-30 01:07:23 +02:00 |
|
|
Putnam3145
|
c253a2de86
|
alright how about these
|
2021-06-21 09:52:54 -07:00 |
|
|
siliconsandGitHub
|
3d86ce9bda
|
Merge pull request #14787 from WanderingFox95/WanderingFox95-ORV-Revamp
ORV Uniform Revamp
|
2021-06-09 11:17:06 -07:00 |
|
|
WanderingFox95andGitHub
|
9cdc45a905
|
Bit of this
|
2021-06-02 15:27:47 +02:00 |
|
|
WanderingFox95andGitHub
|
b563e6c2e0
|
Splits Engineering and Security ORV Suits
|
2021-06-02 15:25:50 +02:00 |
|
|
zerothebigboy
|
7dea33f6c2
|
doge
|
2021-05-27 16:08:28 -04:00 |
|
|
LinandGitHub
|
8d9571b863
|
Merge pull request #14735 from IgiariValkyr/IgiariDonatorFix
Igiari Donator Item fix
|
2021-05-23 14:16:59 -05:00 |
|
|
zerothebigboy
|
37c3bc23a8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair
# Conflicts:
|
2021-05-22 07:21:02 -04:00 |
|
|
siliconsandGitHub
|
acdb57b0d1
|
Merge pull request #14739 from WanderingFox95/WanderingFox95-Ears
A small ear related PR (Deer ears, Rabbit ears)
|
2021-05-22 01:37:05 -06:00 |
|
|
IgiariandGitHub
|
ad6b6b29a0
|
I'm dumb
|
2021-05-20 20:08:07 -05:00 |
|
|
zerothebigboy
|
aaad98725f
|
best i gonna get
|
2021-05-20 19:59:57 -04:00 |
|
|
siliconsandGitHub
|
d0bb22da5f
|
Merge pull request #14653 from timothyteakettle/rp-markings-attempt-two
ports rp's marking system
|
2021-05-19 08:02:59 -06:00 |
|
|
IgiariandGitHub
|
1485b2fab5
|
I was told to do this too
|
2021-05-18 20:19:34 -05:00 |
|
|
WanderingFox95andGitHub
|
0be2784194
|
Ear fixes and additions
Deer Antlers as ears literally make no sense.
Also Rabbit ears that aren't Lop-ears.
|
2021-05-19 01:34:16 +02:00 |
|
|
|
3de1291dcf
|
Good suggest.
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
|
2021-05-18 17:45:55 -05:00 |
|
|
IgiariandGitHub
|
27a779da01
|
It was supposed to be a uniform all along
Fine, I'll fix it myself
|
2021-05-18 13:02:45 -05:00 |
|
|
zerothebigboy
|
f52a89bc33
|
chungus
|
2021-05-14 05:20:19 -04:00 |
|
|
timothyteakettle
|
34869215e8
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-14 01:59:32 +01:00 |
|
|
siliconsandGitHub
|
3b1d66efc5
|
Merge pull request #14702 from zeroisthebiggay/fineilldooitmyself
bunny ears but they're not lops (vegas style)
|
2021-05-12 04:42:12 -06:00 |
|
|
zerothebigboy
|
fe96caefdc
|
this is layered correctly
|
2021-05-09 19:15:31 -04:00 |
|
|
zerothebigboy
|
389617ac2f
|
this looks marginally better
|
2021-05-09 05:01:07 -04:00 |
|
|
zerothebigboy
|
181dcc347b
|
cum sex balls penis
|
2021-05-09 04:34:25 -04:00 |
|
|
Timothy Teakettle
|
5bc33c222a
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-08 01:28:23 +01:00 |
|
|
siliconsandGitHub
|
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 |
|
|
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 |
|
|
siliconsandGitHub
|
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 |
|
|
siliconsandGitHub
|
b2151ea989
|
Merge pull request #14501 from Shadow-Quill/RunIconFix
Adds small walk hud icons
|
2021-03-27 01:34:47 -06:00 |
|
|
siliconsandGitHub
|
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 |
|
|
siliconsandGitHub
|
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 |
|
|
siliconsandGitHub
|
5910950a49
|
Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
|
2021-03-22 21:15:14 -06:00 |
|
|
siliconsandGitHub
|
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 |
|