shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,002 Commits 5 Branches 0 Tags
24b4612cc12e623ffaa01ac314cf2fe5d6627671
Commit Graph

43002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Changelogs
310dd7129e Automatic changelog compile [ci skip] 2021-05-22 00:28:44 +00:00
Changelogs
7fe075873c Automatic changelog compile [ci skip] 2021-05-21 00:28:37 +00: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
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
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
WanderingFox95
eab45f0d64 Apply suggestions from code review 
They're very fair.

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-05-19 09:48:38 +02:00
Changelogs
d2c947c414 Automatic changelog compile [ci skip] 2021-05-19 00:27:25 +00:00
WanderingFox95
808e94899f Ear Adjustments 2021-05-19 01:38:28 +02:00
WanderingFox95
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
Putnam
fc31453587 Makes antags actually get activity properly 2021-05-18 16:27:07 -07:00
Putnam
030361e1cc suggestions 2021-05-18 16:18:57 -07:00
silicons
18a2182c9a Merge pull request #14720 from zeroisthebiggay/chungus 
i fail color theory; makes vegasbunny ears brighter
 2021-05-18 17:09:22 -06:00
CitadelStationBot
d4b9c514a1 Automatic changelog generation for PR #14725 [ci skip] 2021-05-18 18:09:16 -05:00
silicons
3dc78fa64d Merge pull request #14725 from zeroisthebiggay/baystation 
now approaching: Baystation
 2021-05-18 17:09:13 -06:00
CitadelStationBot
5fb4cb2003 Automatic changelog generation for PR #14730 [ci skip] 2021-05-18 18:09:07 -05:00
silicons
28c0d2c3cf Merge pull request #14730 from shellspeed1/plumbing-pod 
Empty mining capsule pod for all those fun projects which need space.
 2021-05-18 17:09:05 -06:00
CitadelStationBot
d0c20597f1 Automatic changelog generation for PR #14731 [ci skip] 2021-05-18 18:09:00 -05:00
silicons
898d1d2c7f Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink 
The E-Fink (Yes, really)
 2021-05-18 17:08:58 -06:00
CitadelStationBot
a515911b07 Automatic changelog generation for PR #14727 [ci skip] 2021-05-18 17:44:38 -05:00
silicons
58df45ee3f Merge pull request #14727 from zeroisthebiggay/patch-10 
more drink mixture flavortext
 2021-05-18 16:44:35 -06:00
CitadelStationBot
66a7201539 Automatic changelog generation for PR #14726 [ci skip] 2021-05-18 17:44:27 -05:00
silicons
80bb2b235b Merge pull request #14726 from zeroisthebiggay/carshalash 
ports Amaretto from TG
 2021-05-18 16:44:24 -06:00
Changelogs
79051c3e8e Automatic changelog compile [ci skip] 2021-05-18 00:30:35 +00:00
qweq12yt
ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00
qweq12yt
9dd372ed11 fix void cloak going to the void 2021-05-17 17:33:23 -03:00
silicons
780a579c7b Update SDQL_2_wrappers.dm 2021-05-17 12:20:15 -07:00
Timothy Teakettle
da7c1ddb0a bold statement for someone who didnt test their code 2021-05-17 19:04:51 +01:00