zerothebigboy
|
fc3c898cd4
|
tab
|
2021-05-24 21:49:36 -04:00 |
|
zerothebigboy
|
36fe3fef76
|
abuse
|
2021-05-24 21:40:15 -04:00 |
|
Changelogs
|
45a7a70665
|
Automatic changelog compile [ci skip]
|
2021-05-24 00:30:01 +00:00 |
|
Lin
|
8d9571b863
|
Merge pull request #14735 from IgiariValkyr/IgiariDonatorFix
Igiari Donator Item fix
|
2021-05-23 14:16:59 -05:00 |
|
CitadelStationBot
|
35e791ffc5
|
Automatic changelog generation for PR #14737 [ci skip]
|
2021-05-23 09:52:27 -05:00 |
|
silicons
|
eba3f554bc
|
Merge pull request #14737 from zeroisthebiggay/KILL
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
|
2021-05-23 08:52:25 -06:00 |
|
CitadelStationBot
|
2742cb6988
|
Automatic changelog generation for PR #14736 [ci skip]
|
2021-05-23 09:52:16 -05:00 |
|
silicons
|
6d81996d8b
|
Merge pull request #14736 from zeroisthebiggay/hair
big Aerial Rodent hair port because hair moment
|
2021-05-23 08:52:14 -06:00 |
|
Changelogs
|
a973c09f42
|
Automatic changelog compile [ci skip]
|
2021-05-23 00:32:02 +00:00 |
|
zerothebigboy
|
25c99bb23c
|
fuckihatecoding
|
2021-05-22 11:52:55 -04:00 |
|
zerothebigboy
|
01a9904b97
|
SHOW THE UNVERSIONED FILES
|
2021-05-22 10:29:57 -04:00 |
|
zeroisthebiggay
|
84e0167698
|
Delete AutoChangeLog-pr-14738.yml
|
2021-05-22 10:28:46 -04:00 |
|
zerothebigboy
|
07682b71b3
|
shoujo
|
2021-05-22 10:28:06 -04:00 |
|
zerothebigboy
|
43228f96cf
|
kinu
|
2021-05-22 09:35:43 -04: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 |
|
CitadelStationBot
|
24b4612cc1
|
Automatic changelog generation for PR #14716 [ci skip]
|
2021-05-22 04:41:59 -05:00 |
|
silicons
|
92e019dd56
|
Merge pull request #14716 from Putnam3145/fix-blacklisting-traits
Makes species/antag trait blacklist no longer remove ALL traits
|
2021-05-22 03:41:57 -06:00 |
|
CitadelStationBot
|
aa5f52ad61
|
Automatic changelog generation for PR #14743 [ci skip]
|
2021-05-22 02:38:07 -05:00 |
|
silicons
|
57584b11d2
|
Merge pull request #14743 from keronshb/contractor25
Lowers pop for Contractors down to 25.
|
2021-05-22 01:38:05 -06:00 |
|
CitadelStationBot
|
36326284f0
|
Automatic changelog generation for PR #14742 [ci skip]
|
2021-05-22 02:38:02 -05:00 |
|
silicons
|
e1a800ff49
|
Merge pull request #14742 from keronshb/specialhudport
(READY) Ports Special Hud icons for some simple mobs
|
2021-05-22 01:37:59 -06:00 |
|
CitadelStationBot
|
daf3864e3e
|
Automatic changelog generation for PR #14739 [ci skip]
|
2021-05-22 02:37:07 -05:00 |
|
silicons
|
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 |
|
zerothebigboy
|
1d3a60ee69
|
inari
|
2021-05-21 23:52:25 -04:00 |
|
zerothebigboy
|
af24fef322
|
inari
|
2021-05-21 20:46:48 -04:00 |
|
Changelogs
|
310dd7129e
|
Automatic changelog compile [ci skip]
|
2021-05-22 00:28:44 +00:00 |
|
Igiari
|
ad6b6b29a0
|
I'm dumb
|
2021-05-20 20:08:07 -05:00 |
|
Changelogs
|
7fe075873c
|
Automatic changelog compile [ci skip]
|
2021-05-21 00:28:37 +00:00 |
|
zerothebigboy
|
aaad98725f
|
best i gonna get
|
2021-05-20 19:59:57 -04:00 |
|
zerothebigboy
|
f54c893748
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair
|
2021-05-20 18:57:51 -04:00 |
|
CitadelStationBot
|
743a4f02d6
|
Automatic changelog generation for PR #14738 [ci skip]
|
2021-05-20 13:33:53 -05:00 |
|
Lin
|
67ea47998c
|
Merge pull request #14738 from Putnam3145/fix-activity-again
Makes antags actually get activity properly
|
2021-05-20 13:33:51 -05:00 |
|
keronshb
|
99a94e2b3a
|
Contractor poplock to 25
Title
|
2021-05-19 21:53:14 -04:00 |
|
Changelogs
|
f3024d48ea
|
Automatic changelog compile [ci skip]
|
2021-05-20 00:27:46 +00:00 |
|
keronshb
|
c8de0c898f
|
Merge remote-tracking branch 'origin/specialhudport' into specialhudport
|
2021-05-19 19:16:55 -04:00 |
|
keronshb
|
b33269c806
|
trailing endline
|
2021-05-19 19:16:24 -04:00 |
|
keronshb
|
862f8f23f9
|
Trailing endline
oops
|
2021-05-19 19:11:15 -04:00 |
|
keronshb
|
a6e157ba73
|
IT WORKS!!
|
2021-05-19 19:03:21 -04:00 |
|
Lin
|
acb2177a85
|
Merge pull request #14732 from Citadel-Station-13/silicons-patch-32
adds _contents() wrapper for SELECT SDQL2 statements
|
2021-05-19 14:50:18 -05:00 |
|
CitadelStationBot
|
a8b5484b48
|
Automatic changelog generation for PR #14733 [ci skip]
|
2021-05-19 14:49:03 -05:00 |
|
Lin
|
0c77834c56
|
Merge pull request #14733 from qweq12yt/misc-fixes
[Fix] Even More bug fixing
|
2021-05-19 14:49:00 -05:00 |
|
keronshb
|
58cb278327
|
Missing errors and icons
|
2021-05-19 15:09:56 -04:00 |
|
zerothebigboy
|
bc61ada440
|
KILL
|
2021-05-19 13:24:40 -04:00 |
|
keronshb
|
60965939d6
|
bigger mobs have some special health bars (#49104)
* cool beans
* more, more!
* smol fix
|
2021-05-19 11:59:50 -04:00 |
|
keronshb
|
e6952d43f5
|
Merge remote-tracking branch 'upstream/master'
|
2021-05-19 11:47:30 -04:00 |
|
CitadelStationBot
|
3a28e8a7ed
|
Automatic changelog generation for PR #14653 [ci skip]
|
2021-05-19 09:03:02 -05:00 |
|
silicons
|
d0bb22da5f
|
Merge pull request #14653 from timothyteakettle/rp-markings-attempt-two
ports rp's marking system
|
2021-05-19 08:02:59 -06:00 |
|
zerothebigboy
|
af4823e83c
|
KILL
|
2021-05-19 09:19:49 -04:00 |
|
WanderingFox95
|
0294ddb2a6
|
Apply suggestions from code review
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
|
2021-05-19 13:01:13 +02:00 |
|
WanderingFox95
|
4cd8cbd3e4
|
Same changes for the non human section of the ear file.
consistency.
|
2021-05-19 12:27:32 +02:00 |
|