Commit Graph

39188 Commits

Author SHA1 Message Date
Timothy Teakettle 68c0caf4fa better verification 2020-11-07 19:32:23 +00:00
Timothy Teakettle 82e561675c yes 2020-11-06 21:47:22 +00:00
Timothy Teakettle 1993364ce0 Revert "deletes one word"
This reverts commit 8b7fd151af.
2020-11-06 21:45:52 +00:00
Timothy Teakettle fdd7cc9843 Revert "fix"
This reverts commit 58e884d18e.
2020-11-06 21:45:47 +00:00
Timothy Teakettle e2ca7164b9 age verification 2020-11-06 21:00:14 +00:00
Timothy Teakettle 58e884d18e fix 2020-11-05 21:49:46 +00:00
Timothy Teakettle 8b7fd151af deletes one word 2020-11-05 16:59:49 +00: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
CitadelStationBot 4ae92bc482 Automatic changelog generation for PR #13632 [ci skip] 2020-11-01 15:03:46 -06:00
Timothy Teakettle db87297536 fix (#13632) 2020-11-01 22:03:43 +01:00
CitadelStationBot 99b7504795 Automatic changelog generation for PR #13633 [ci skip] 2020-11-01 15:02:17 -06: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
CitadelStationBot 75957ac7aa Automatic changelog generation for PR #13629 [ci skip] 2020-11-01 15:02:00 -06:00
silicons 57677183d3 Update anomaly.dm (#13629) 2020-11-01 22:01:57 +01:00
CitadelStationBot 66859ffea2 Automatic changelog generation for PR #13647 [ci skip] 2020-11-01 15:00:23 -06:00
zeroisthebiggay 44eb62b388 a (#13647) 2020-11-01 22:00:20 +01:00
CitadelStationBot db53b1f181 Automatic changelog generation for PR #13648 [ci skip] 2020-11-01 14:59:26 -06: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
CitadelStationBot 002c0b231b Automatic changelog generation for PR #13567 [ci skip] 2020-11-01 14:41:01 -06: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
Putnam3145 713ed9018e Merge pull request #13646 from deathride58/fuckcircuitatmos
[s] makes circuit atmos patch cover two more things i missed
2020-10-29 18:33:47 -07:00
deathride58 b11947a468 covers filters and mixers as well 2020-10-29 21:31:06 -04:00
Putnam3145 0aa9b2ae90 Merge pull request #13645 from deathride58/fuckcircuitatmos
[s] removes the ability to an entire canister
2020-10-29 18:26:59 -07: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
CitadelStationBot cc1d498ab6 Automatic changelog generation for PR #13636 [ci skip] 2020-10-29 16:05:21 -05:00
silicons 871084f43e Merge pull request #13636 from SiliconMain/patch-11
gas masks for engi loadouts
2020-10-29 14:05:19 -07:00
silicons 453d5081a7 Merge pull request #13628 from MrJWhit/messing-with-boxstations-maint
Adjusting Boxstation's Southeast Maint (three new rooms)
2020-10-28 07:54:04 -07:00
CitadelStationBot bcc9c4ef17 Automatic changelog generation for PR #13626 [ci skip] 2020-10-28 09:53:48 -05: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
CitadelStationBot 54a878df1e Automatic changelog generation for PR #13627 [ci skip] 2020-10-28 09:53:26 -05: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
CitadelStationBot bd13c6f1d9 Automatic changelog generation for PR #13616 [ci skip] 2020-10-28 09:49:42 -05: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
CitadelStationBot fe2de56661 Automatic changelog generation for PR #13612 [ci skip] 2020-10-28 09:47:28 -05:00
silicons 2827893950 Merge pull request #13612 from MrJWhit/hermit-expansion
Space Hermit map buff
2020-10-28 07:47:24 -07:00
CitadelStationBot 720ee01f8c Automatic changelog generation for PR #13607 [ci skip] 2020-10-28 09:46:59 -05:00
silicons 5c53a2cbe2 Merge pull request #13607 from timothyteakettle/polychrome-maid
polychromic maid outfit
2020-10-28 07:46:55 -07:00
CitadelStationBot 41dbfa8476 Automatic changelog generation for PR #13605 [ci skip] 2020-10-28 09:46:28 -05: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
CitadelStationBot ab3ff76022 Automatic changelog generation for PR #13603 [ci skip] 2020-10-28 09:44:05 -05: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
CitadelStationBot 1de7408203 Automatic changelog generation for PR #13601 [ci skip] 2020-10-28 09:43:43 -05: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
silicons ac4e82cbc7 Merge pull request #13569 from Cyberboss/patch-4
Adds automatic TGS DMAPI updates
2020-10-28 07:42:36 -07:00
CitadelStationBot 8de3cdbf28 Automatic changelog generation for PR #13592 [ci skip] 2020-10-28 09:41:47 -05:00
silicons e672ee847e Merge pull request #13592 from Putnam3145/stat-voting-tweaks
Adds ranked choice ballots to stat voting
2020-10-28 07:41:43 -07:00
CitadelStationBot a807c21967 Automatic changelog generation for PR #13593 [ci skip] 2020-10-28 09:41:39 -05:00