Commit Graph

21263 Commits

Author SHA1 Message Date
datlo
f0cbc42cc3 Change greey's dufflebag to a backpack 2020-03-16 13:19:13 +01: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
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
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
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
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
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
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
Patrick Meade
54f538307c Panic bunker threshold is configurable (#13080)
* Panic bunker threshold is configurable

* Cleaned up bunker automation logic, added admin control verb

* Changed Set Server Capacity to two toggle verbs; modified logic

* Revert "Changed Set Server Capacity to two toggle verbs; modified logic"

This reverts commit 398a8615a5.

* Revert "Cleaned up bunker automation logic, added admin control verb"

This reverts commit b6a6d49714.
2020-03-12 01:24:16 -06:00
AffectedArc07
5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
Fox McCloud
47263ded27 Merge remote-tracking branch 'upstream/master' into cig-tweaks 2020-03-08 22:35:49 -04:00
variableundefined
edebec5194 Merge pull request #13021 from Fox-McCloud/add-cbd
Adds CBD
2020-03-08 21:46:20 -04:00
joep van der velden
9809e5f7b7 Review fixes 2020-03-08 11:49:15 +01:00
joep van der velden
166d83892a Put it in the say_log instead 2020-03-08 11:39:54 +01:00
variableundefined
5ba0426618 Merge pull request #13074 from Fox-McCloud/camera-nope
Removes Creatable Video Cameras
2020-03-08 03:46:32 -04:00
variableundefined
5f6e9f8cb2 Merge pull request #13007 from TheSardele/log-change
Adds a log for admins
2020-03-08 03:43:52 -04:00
variableundefined
bd4019a494 Merge pull request #12848 from Arvenius169/spellingfix
Fixes a Minor Spelling Error In Busy Space
2020-03-08 03:32:43 -04:00
Fox McCloud
42eb7fb4c4 Merge pull request #12875 from Aquilar/naniteoversightfix
Making Nanites also fix internal bleeding.
2020-03-08 03:32:04 -04:00
variableundefined
c257d2d41d Merge pull request #12823 from Superhats/PlasmaDust
Plasma dust now heals plasmamen
2020-03-08 03:31:18 -04:00
variableundefined
92f0df43bd Merge pull request #13043 from farie82/spoder-runtime-logging
Terrors spiders can now spawn again. Logs the corrupt vent and continues
2020-03-07 23:46:25 -05:00
Fox McCloud
dde970a6bd Merge pull request #12841 from Arvenius169/spacetempfix
Space Temperature Implementation
2020-03-07 19:04:04 -05:00
Fox McCloud
37cc564a1e Merge pull request #12704 from moxian/paper-uid
Make paperwork popups use UID as a window id.
2020-03-07 18:50:54 -05:00
Fox McCloud
f496c73988 Merge pull request #12694 from TheSardele/slime-log
Logs slime attacks correctly
2020-03-07 18:43:35 -05:00
Fox McCloud
df2c35d4c1 Merge pull request #12698 from moxian/colorblind-photo
Make photos look the same as reality to colorblind people.
2020-03-07 18:42:39 -05:00
Fox McCloud
47fec9a889 Merge pull request #12921 from Qwertytoforty/master
Allows vox to drink synthanol without throwing up
2020-03-07 18:40:04 -05:00
Fox McCloud
b3e840916a Merge pull request #13042 from Ty-Omaha/shuttle-computer
Fixes nukie shuttle computer being destructible & others
2020-03-07 18:18:55 -05:00
Patrick Meade
52c43862b2 Traders on Red Alert spawns another event (#13078) 2020-03-07 12:03:47 -07:00
Fox McCloud
4d9c89bdc0 menthol 2020-03-06 23:48:32 -05:00
SteelSlayer
b45a4fc996 spelling 2020-03-06 20:37:20 -06:00
SteelSlayer
894c326725 add_default_robot_items() 2020-03-06 20:35:55 -06:00
SteelSlayer
533717318d review changes 2020-03-06 16:56:02 -06:00
Mitchell
3dab40eba4 Fixes attack logs 2020-03-06 16:38:31 -06:00
SteelSlayer
1b74dc915f no flash 2020-03-06 13:29:47 -06:00
Kyep
49bdfbf3f0 Fixes #13070 - cyborg energy guns breaking (#13071)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-03-05 22:35:02 -07:00
Tayyyyyyy
adf908e855 Fix global narrate not using admin pencode (#13067) 2020-03-05 22:26:20 -07:00
variableundefined
073fefd856 Merge pull request #12843 from farie82/antidrop-implant-fix
Anti drop implants now don't break shit when EMPed
2020-03-05 18:32:07 -05:00
variableundefined
f54bcf8ee9 Merge pull request #13073 from Kyep/cyborg_gun_double_charging_fix
Fixes cyborg energy weapons costing twice as much as intended
2020-03-05 18:30:51 -05:00
variableundefined
7147e51a18 Merge pull request #12645 from Citinited/pa-radiation-fix
Makes the particle accelerator dangerous
2020-03-05 18:27:45 -05:00
Fox McCloud
cd857e378e Removes Creatable Video Cameras 2020-03-04 12:57:23 -05:00
AffectedArc07
1df8d64b23 Fixes admin logging spam 2020-03-04 10:37:47 +00:00
Kyep
bd85adb11c Fixes cyborg energy weapons costing twice as much as intended 2020-03-04 02:25:36 -08:00
AffectedArc07
a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
Tayyyyyyy
fe396a40c9 Announce to command when ERT request transmitted (#13059)
* Announce to command when ERT request transmitted

* Improve announcement w/ reason and name of device
2020-03-03 09:07:08 -07:00
Ty-Omaha
edaece107c VV emote logs (#13040) 2020-03-03 08:49:11 -07:00