shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,182 Commits 5 Branches 0 Tags
503d0156c6215ba02e66441706ae8d2cddb67ccc
Commit Graph

17075 Commits

Author SHA1 Message Date
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
silicons
d500a12b70 adds EMOTE_BOTH and EMOTE_OMNI which is both audible/visible and ignores checks entirely. subtler/subtle is omni and regular emotes are both. (#13584) 
* Update say.dm

* Update mob.dm

* Update emotes.dm

* Update say_vr.dm

* Update emote.dm

* Update emotes.dm

* Update mob.dm

* Update say_vr.dm

* Update drake.dm
 2020-11-01 22:09:38 +01:00
silicons
4017618744 removes batform from roundstart halloween vampire (#13623) 
* Update species.dm

* Update vampire.dm

* Update vampire.dm
 2020-11-01 22:05:49 +01:00
Timothy Teakettle
db87297536 fix (#13632) 2020-11-01 22:03:43 +01:00
ArchieBeepBoop
9eff4147fd Fixes the Layer 3 Outlet Injector mapping asset being on the wrong layer (#13633) 
* why is this on the wrong layer?

* ahem, icon state.

Co-authored-by: Dip <gabriel.spm002@gmail.com>
 2020-11-01 22:02:15 +01:00
silicons
57677183d3 Update anomaly.dm (#13629) 2020-11-01 22:01:57 +01:00
DeltaFire15
91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +01:00
Timothy Teakettle
46dbb9345d slime puddles look better and cant be abused by lings (#13567) 
* perfect

* further changes

* no squeaking please

* no more squeaking damnit

* no more squeaking damnit

* slower

* they get broken armor

* broken armor application

* Apply suggestions from code review

* add a comma

* make crossed work properly

* Update squeak.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-11-01 21:40:58 +01:00
deathride58
b11947a468 covers filters and mixers as well 2020-10-29 21:31:06 -04:00
deathride58
5d79ea3441 forgot volume pumps, fuk 2020-10-29 21:00:56 -04:00
deathride58
75280c9705 patches recently-found atmos circuit exploit 2020-10-29 20:27:47 -04:00
silicons
1baa3013b3 Merge pull request #13626 from zeroisthebiggay/GOD 
[SALT] MAKES MEGAFAUNA ITEMS LAVAPROOF (LIKE THE LAVA STAFF)
 2020-10-28 07:53:44 -07:00
silicons
0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841 
Here I fix a few issues.
 2020-10-28 07:53:22 -07:00
silicons
2d842270f5 Merge pull request #13625 from LetterN/revert-12994-patch-37 
Reverts this circuit frame removal
 2020-10-28 07:53:15 -07:00
silicons
598c2fab2b Merge pull request #13616 from Citadel-Station-13/Ghommie-patch-1 
Quick clown/mime masks designs fix.
 2020-10-28 07:49:38 -07:00
silicons
5c53a2cbe2 Merge pull request #13607 from timothyteakettle/polychrome-maid 
polychromic maid outfit
 2020-10-28 07:46:55 -07:00
silicons
f2747a3b1c Merge pull request #13605 from Trilbyspaceclone/patch-403 
Adds corporate uniforms to the clothing vender
 2020-10-28 07:46:24 -07:00
silicons
1a1b6af819 Merge pull request #13603 from kappa-sama/patch-43 
controversial shotgun buff (very scary)
 2020-10-28 07:44:02 -07:00
silicons
6d2028abb5 Merge pull request #13601 from timothyteakettle/critical-item 
antagonistic items will no longer fail to be placed on you
 2020-10-28 07:43:39 -07:00
Ghommie
444a440fba oh 2020-10-25 15:38:36 +01:00
Ghommie
f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Delams-The-SM
52abbbf247 Fixes matrix color radomisation in /proc/randomize_human (#13599) 2020-10-25 13:07:46 +01:00
zeroisthebiggay
626fcf0aeb OOPS 
FUCK
 2020-10-25 05:36:59 -04:00
zeroisthebiggay
2c278ba370 A 
A
 2020-10-25 05:34:53 -04:00
zeroisthebiggay
5eec2b76f5 OK MAYBE NOT INDESTRUCTIBLE 
OK
 2020-10-25 05:34:24 -04:00
zerothebigboy
6577aaac91 FRUSTRATION 2020-10-25 05:30:06 -04:00
Letter N
3d2bd4a98e Revert "removes dildo" 2020-10-25 12:55:04 +08:00
Arturlang
d3616f2d17 Fixes hijack UI (#13598) 
* Fixes hijack UI

* This was lost too it seems

* And this

* More stuff that was removed

* Should be good now

* Nice and proper now
 2020-10-24 21:23:52 +02:00
silicons
585208dda9 Update angel.dm (#13621) 2020-10-24 21:22:32 +02:00
silicons
3293715025 Update items.dm (#13622) 2020-10-24 21:22:01 +02:00
Ghom
5d0e26e9a1 Quick clown/mime masks designs fix. 2020-10-23 18:08:54 +02:00
silicons
231c5f0a9d Merge pull request #13581 from Ghommie/Ghommie-cit840 
mime/clown masks' face concealment toggleable with altclick. Plasmaman helmet welding visor & smiley port.
 2020-10-21 15:43:09 -07:00
Trilbyspaceclone
76a046b97a Update clothesmate.dm 2020-10-21 11:39:49 -04:00
timothyteakettle
049f153cbf works but looks weird 2020-10-21 00:55:02 +01:00
kappa-sama
b3fc60c3f5 this too 2020-10-20 19:44:10 -04:00
Timothy Teakettle
4afceebcc1 critical 2020-10-20 02:11:08 +01:00
Putnam3145
c934e6ca25 Merge pull request #13565 from Citadel-Station-13/silicons-patch-22 
adds empty() proc to pipelines that purges all connected airs to avoid sdql2 and proccall torture (SPT) whenever atmos breaks and the station is -#1.IND degrees hot
 2020-10-19 14:31:40 -07:00
silicons
b38f9e982e Update code/modules/atmospherics/machinery/datum_pipeline.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-19 14:17:23 -07:00
BlueWildrose
86d15d8fb3 Fixed species-specific drinks not giving a mood boost if right species (#13585) 
* Species drink moodboost fix

* code cleanup

* Revert "code cleanup"

This reverts commit fa308a2acd213b085308ebf3595d08463cbcd7be.

* code cleanup

* meant to make this 26 not 30

* Committing Putnam's suggestion

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-19 11:46:36 +02:00
Putnam3145
0f56a97dd0 Merge pull request #13589 from timothyteakettle/funny-implanter 
autosurgeons from the travelling trader have uses set to 1 instead of INFINITY
 2020-10-18 22:45:32 -07:00
Timothy Teakettle
861f225f2d trader fix 2020-10-18 03:25:17 +01:00
silicons
44dc292101 Update preferences_savefile.dm (#13557) 2020-10-17 13:58:33 +02:00
Zandario
fcd8fec815 Fixes an oversight and updates some defines (#13558) 2020-10-17 12:37:58 +02:00
Putnam3145
f6b93a242c Makes get_damaged_bodyparts use proper arguments (#13570) 
* you're not being clever, you're being obfuscatory, stop this

* Made get_damaged_bodyparts use proper arguments

* Actually shouldn't have the arg
 2020-10-17 11:44:15 +02:00
DeltaFire15
ca21572aa7 Fixes vamp shapeshifting a bit (#13562) 
* fixes vamp shapeshifting a bit

Title. Buncha weird stuff happening.

* ghom's request

moves the check to ../bat/cast(), adds type safety
 2020-10-17 11:39:58 +02:00
MrJWhit
4fdacf0560 Porting putnams ventcrawling PR and Fix (#13571) 
* Porting putnams rage

* And the bugfix
 2020-10-17 11:39:25 +02:00
Putnam3145
099a82b936 Made fermichem displays work correctly. (#13577) 2020-10-16 22:27:37 +02:00
Ghom
b893e40494 Update gasmask.dm 2020-10-16 20:57:08 +02:00
Ghommie
c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00