shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,064 Commits 5 Branches 0 Tags
e3d7b3adc5cd97ec00c0d712eb09a025faca6069
Commit Graph

19348 Commits

Author SHA1 Message Date
DrPainis 51911e1f27 adds the recipe for goliath calamari 2021-05-23 23:36:11 -04:00
DrPainis a7add64905 adds a lazily made sprite for goliath calamari 
I suck at spriting so this is the best I could do.
 2021-05-23 23:29:25 -04:00
DrPainis ce1b170b46 adds goliath calamari 2021-05-23 23:27:48 -04: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
zerothebigboy 25c99bb23c fuckihatecoding 2021-05-22 11:52:55 -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
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
silicons 57584b11d2 Merge pull request #14743 from keronshb/contractor25 
Lowers pop for Contractors down to 25.
 2021-05-22 01:38:05 -06: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
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
Putnam e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
Putnam 62279e449e Well, that works 2021-05-21 18:51:13 -07:00
zerothebigboy af24fef322 inari 2021-05-21 20:46:48 -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
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
keronshb 538efd2d8f Alt Click and Alt Click message 2021-05-19 20:01:11 -04:00
keronshb 88dc0821d1 User gibs when being turned into a spess dragon 2021-05-19 19:49:48 -04:00
keronshb 1d843cc72f Part 3 - the missing stuff 2021-05-19 19:19:35 -04:00
keronshb a15637a929 Part 1 of Health Bars for Space Dragon 2021-05-19 19:18:19 -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
Lin 0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes 
[Fix] Even More bug fixing
 2021-05-19 14:49:00 -05: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 f4780d4b5a Correct Raw Prophet recipe 2021-05-19 11:19:12 -04:00
keronshb 547b3d0a0b TP finally works 2021-05-19 11:15:48 -04: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
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
keronshb b8b25662ff Couple of fixes, almost ready to go 2021-05-18 22:12:02 -04:00
zerothebigboy e7c0dea497 actually an eris hairdo 2021-05-18 22:04:59 -04:00
zerothebigboy 89b2d74895 actually an eris hairdo 2021-05-18 22:00:35 -04:00
WanderingFox95 808e94899f Ear Adjustments 2021-05-19 01:38:28 +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 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
silicons 898d1d2c7f Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink 
The E-Fink (Yes, really)
 2021-05-18 17:08:58 -06:00
zerothebigboy e22bdc3fb5 KILL 2021-05-18 18:56:28 -04:00
zerothebigboy fff719c408 KILL 2021-05-18 18:47:12 -04:00
silicons 58df45ee3f Merge pull request #14727 from zeroisthebiggay/patch-10 
more drink mixture flavortext
 2021-05-18 16:44:35 -06:00
silicons 80bb2b235b Merge pull request #14726 from zeroisthebiggay/carshalash 
ports Amaretto from TG
 2021-05-18 16:44:24 -06:00
zeroisthebiggay 55383e0387 Update hair_head.dm 2021-05-18 17:27:59 -04:00
zerothebigboy 20ac75020d steponmycock 2021-05-18 17:23:07 -04:00
zeroisthebiggay cc29443b53 Update hair_head.dm 2021-05-18 17:06:20 -04:00
zerothebigboy 2a3eb07bfd steponmycock 2021-05-18 16:57:52 -04:00
keronshb d2f69acaf8 Space Dragon Event 
Ports the Space Dragon event
 2021-05-18 12:06:32 -04:00
qweq12yt ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00