Commit Graph

34270 Commits

Author SHA1 Message Date
TheSardele
cd23b41b20 Makes kicking more client than mob dependent 2020-03-22 13:24:06 +01:00
TheSardele
6c5801eb1f Use if instead of switch 2020-03-20 21:16:36 +01:00
TheSardele
bfa016cb6e Adds confirmation prompt to kicking 2020-03-19 18:39:04 +01:00
variableundefined
5e2b731964 Adds an extra handheld defib to medical lockers. (#13121)
* Zap Zap

* Fixes CLRF
2020-03-17 19:02:46 -04:00
Mitchs98
bbfcd0de04 Alphabetizes Access on Electronics. (#13120)
* ALPHABETIZE!!!

Yes.

* Kills spaces, hopefully.

* Fixes CLRF
2020-03-17 19:02:36 -04:00
Mitchell
8e75487346 Fixes CLRF 2020-03-17 17:43:11 -05:00
Mitchell
230e3d8abc Merge branch 'master' into adddefibs 2020-03-17 17:26:29 -05:00
Tom Heeren
341c438ce3 Adds the borg deathgasp sound to IPCs, and updates the IPC deathgasp message (#13116) 2020-03-17 18:13:27 -04:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
farie82
ec19ea3d2d Rename TOUCH to REAGENT_TOUCH fix (#13135) 2020-03-17 16:40:44 -04:00
Ty-Omaha
bb340f076d Kentucky Fried Vox (#13114)
* is finger lickin goods yaya

* is code improvements yaya

* is updates yaya
2020-03-17 15:12:52 -04:00
farie82
0cc109e53e Filters say of illegal characters (#13112)
* Filters say of illegal characters

* No more ~
2020-03-17 15:02:40 -04:00
Fox McCloud
93c870a2be Implements A Couple Goon Reagents (#13110)
* Implements A Couple Goon Reagents

* taste
2020-03-17 15:02:24 -04:00
variableundefined
995e2dc198 Merge pull request #13107 from Ty-Omaha/fax-notice
Better fax & headset message notice
2020-03-17 15:01:32 -04:00
variableundefined
6d66f81f93 Merge pull request #13109 from Birdtalon/char-slots
Increases char slots to 30
2020-03-17 15:00:41 -04:00
variableundefined
38fe39ed7e Merge pull request #13108 from farie82/FLW-change
Makes the FLW command ignore permissions if you're already an observer
2020-03-17 15:00:13 -04:00
variableundefined
a909dade34 Merge pull request #13127 from datlo/nerdbackpack
Change greey's fluff dufflebag to a backpack
2020-03-17 14:59:35 -04:00
variableundefined
431de880b9 Merge pull request #13130 from Gatchapod/blood-miner-sprite-fix
Fix to blood-drunk miner's sprite
2020-03-17 14:59:21 -04:00
Fox McCloud
b1e88e0a4c Makes Most Emotes Age Pitched (#13022) 2020-03-16 22:59:53 -06:00
datlo
f0cbc42cc3 Change greey's dufflebag to a backpack 2020-03-16 13:19:13 +01:00
Gatchapod
33b7f4ce5a Fixes blood-drunk miner's sprite, cutting its size from 64x64 to 45x32 and moves it to Lavaland folder, where other fauna can be found.
This makes interacting with him more comfortable and less confusing.
Removes unnecessary miner sprites for alienqueen.dmi.
Changes pixel_x value of the mob to match sprite changes.
2020-03-16 02:02:08 +01:00
SteelSlayer
4a12c0bb5c Fixes some oversights with storage altclicking
Update secure.dm
2020-03-15 11:40:36 -05:00
variableundefined
4c24624313 Merge pull request #13027 from Fox-McCloud/goonchem-heparin
Goonchem: Heparin Rework
2020-03-14 23:53:42 -04:00
Fox McCloud
48d0dfdacc Merge pull request #12863 from SteelSlayer/altclick-storage
Adds an alt-click shortcut for opening storage items
2020-03-14 23:26:05 -04:00
Fox McCloud
964f5e9cbc Merge pull request #13020 from farie82/nerf-sentient-animals
Caps the health and damage of sentient animals
2020-03-14 23:24:49 -04:00
Fox McCloud
d270f52783 Merge pull request #12917 from farie82/log-whispering
Whispering now is logged in VV
2020-03-14 23:19:10 -04:00
farie82
872ffb5c1b Update sentience.dm 2020-03-14 22:08:30 +01:00
SteelSlayer
276bf1adc2 this makes more sense 2020-03-14 15:26:26 -05:00
Mitchell
a65bb8e1e6 Zap Zap 2020-03-14 15:21:50 -05:00
Fox McCloud
3a08570675 Merge pull request #12616 from SteelSlayer/ai-voice-to-text-pref
Adds a "Hear/Silence AI Voice Announcements" verb to the preferences tab
2020-03-14 16:01:07 -04:00
Fox McCloud
c167bbd52d Merge pull request #12644 from datlo/hisgraceimprovement
Make His Grace simpler to link with
2020-03-14 15:58:58 -04:00
Fox McCloud
f188142018 Merge pull request #12673 from Citinited/snow-machine-order-tweak
Snow machine can be ordered on both cargo consoles, not just the supply console
2020-03-14 15:57:08 -04:00
Fox McCloud
7869850103 Merge pull request #12814 from farie82/airlock-note-qol
Removing a note from an airlock now puts it in your hands and talismans don't go on airlocks anymore
2020-03-14 15:54:50 -04:00
Fox McCloud
e5c1d9767f Merge pull request #12830 from SteelSlayer/holopara-cancel
Adds a confirmation message to guardian creating items; Allows users to cancel using them
2020-03-14 15:50:51 -04:00
Fox McCloud
64440fd8de Merge pull request #12855 from SteelSlayer/cyberfloor
Adds circuit flooring to the floor painter
2020-03-14 15:46:56 -04:00
Fox McCloud
38d1172a79 Merge pull request #12897 from farie82/fix-antag-civ-prefs
Antags that have their job unavailable will now spawn according to their preferences
2020-03-14 15:43:42 -04:00
Fox McCloud
af26b704a2 Merge pull request #12895 from farie82/more-descriptive-offer-ghost
Adds the job and antag status to the offer to ghost question
2020-03-14 15:42:26 -04:00
Fox McCloud
a400e8b1c8 Merge pull request #12896 from farie82/clingvampagent-fix
Vamps and cling on agent + cling/vamp rounds will spawn now
2020-03-14 15:41:37 -04:00
Fox McCloud
c8b6b26428 Merge pull request #12902 from Cazdon/wizardEnd
Wizard Apprentices pass the IsWizard check. Wizard rounds end when all Wizards and Apprentices are dead.
2020-03-14 15:40:09 -04:00
Fox McCloud
c8ebf90620 Merge pull request #12911 from Ty-Omaha/malf-ai2
Makes traitor AIs always malf
2020-03-14 15:36:22 -04:00
Fox McCloud
baa80035b0 Merge pull request #12924 from farie82/queen-spit-block
Terror queen spit is now blockable
2020-03-14 15:34:29 -04:00
Fox McCloud
8ce3b1da16 Merge pull request #12932 from AffectedArc07/var/const-to-define
Replaces all var/const with #define
2020-03-14 15:33:44 -04:00
Fox McCloud
9a9101434b Merge pull request #13048 from Ty-Omaha/ERT
ERT activation announcement
2020-03-14 15:26:07 -04:00
Fox McCloud
f0295c03cd Merge pull request #13050 from Mitchs98/kravmaga
Adds logs for Krav Maga and Carp.
2020-03-14 15:24:33 -04:00
Fox McCloud
9d678f42af Merge pull request #13066 from Quantum-M/gameBooks
SOP Books now read the SOP on the wiki and has new sprites
2020-03-14 15:23:11 -04:00
Fox McCloud
98b5a8014f Merge pull request #13028 from farie82/barrier-walking
Walking through barriers now also lets a dragged carbon get through
2020-03-14 15:11:40 -04:00
Fox McCloud
3df642ffa4 Merge pull request #12678 from Kyep/depot_loot_fix
Fixes 12677 - depot self-destruct leaves loot behind
2020-03-14 15:03:09 -04:00
Fox McCloud
e26ed2db55 Merge pull request #13118 from farie82/recharger-fix
Cyborg recharger now throws occupants out when destroyed and heals IPCs even when they are not hungry
2020-03-14 15:01:51 -04:00
farie82
ca8d9c7c95 Update rechargestation.dm 2020-03-14 19:49:21 +01:00
Fox McCloud
c6767b2c42 Merge pull request #13085 from SteelSlayer/drone-no-flash
Maintenance drones no longer get a flash
2020-03-14 14:21:58 -04:00