Commit Graph
24020 Commits
Author SHA1 Message Date
Fox McCloudandGitHub b9d322bbbe Merge pull request #17005 from paulo-e/fix/17003
Can't dispose abstract items #17003
2021-11-01 18:01:37 -04:00
Fox McCloudandGitHub 13a749c452 Merge pull request #16976 from SabreML/ipc-damage-overlays
Fixes IPC damage overlays not updating
2021-11-01 18:00:52 -04:00
variableundefinedandGitHub d2d4ec19b4 Merge pull request #16989 from rythenx/add-fax-log
add a notification when replying to fax
2021-10-31 22:33:50 -05:00
variableundefinedandGitHub 9996b7bfa3 Merge pull request #16990 from Vi3trice/aperture-shower-curtain
Adds feedback to the Telegun's target setting, and applies it to the current shot
2021-10-31 22:33:24 -05:00
variableundefinedandGitHub 416f330481 Merge pull request #16999 from lewcc/xeno-orbit-menu
Add xenomorph section to orbit menu
2021-10-31 22:26:11 -05:00
variableundefinedandGitHub c0e21aa64e Merge pull request #16996 from hal9000PR/bnuuy
Adds Bunnies.
2021-10-31 22:24:31 -05:00
Elienay Albuquerque e54d406ffb refactor: more requested changes 2021-10-29 16:18:49 -03:00
Paulo Elienay c767d4b6e6 fix: reverts last commit and adds comment 2021-10-29 06:04:35 -03:00
Elienay Albuquerque e3be4db007 refactor: requested changes 2021-10-28 17:57:42 -03:00
Elienay Albuquerque e0eb271a31 fix(disposal): DRODEL items now ignored 2021-10-28 16:16:34 -03:00
Paulo Elienay 8b36807988 fix(17003): can't dispose abstract items
Abstract items (such as slapper) should't be allow to be disposed away.
2021-10-28 12:47:40 -03:00
lewcc 8d5409d4ff Add xenomorph section to orbit menu 2021-10-27 12:36:15 -04:00
PacifistDalekandGitHub f486448a95 Food Cart Refactor (#16869)
* Food Cart Refactor

* delete unused old sprites

* No longer can be deconstructed or destroyed into smartfridge parts
2021-10-26 23:33:03 +01:00
SabreMLandGitHub 945e00e497 IAA locker, spare headsets, and general locker cleanup (#16440)
* Locker + Bookcase tweaks

* HoS flask
2021-10-26 23:09:45 +01:00
24459904eb henk review
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-10-26 21:38:22 +01:00
hal9000PR e5afa54965 Merge remote-tracking branch 'upstream/master' into bnuuy 2021-10-26 19:53:15 +01:00
hal9000PR f095264807 bnuuy 2021-10-26 19:47:41 +01:00
SabreMLandAffectedArc07 a9ccc59e58 Loop exclusion
Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-10-25 10:34:12 +01:00
Vi3trice a3d515ce4e Makes the telegun a wee bit more sensible 2021-10-23 12:25:11 -04:00
25a333274d Update code/modules/admin/topic.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-10-23 11:53:08 -04:00
97edcd4e6e Update code/modules/admin/topic.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-10-23 10:54:48 -04:00
matttheficusandGitHub 58d3c21ea8 goodbye you annoying spam (#16970) 2021-10-23 10:49:20 +01:00
Shawn HindandShawn Hind c33d100cbd add a notification when replying to fax 2021-10-22 21:30:56 -04:00
Sirryan2002andGitHub e83e81a8d2 bruh (#16983) 2021-10-22 11:26:42 +01:00
Fox McCloudandGitHub a33cd4325a Merge pull request #16560 from AffectedArc07/multi-instance-support
[READY] Multi instance support
2021-10-20 15:25:26 -04:00
SabreML c25f250a91 UpdateDamageIcon() 2021-10-20 16:25:23 +01:00
matttheficusandGitHub 75550c3f8c runtimes bad (#16972) 2021-10-19 10:45:49 +01:00
E-MonaRhgandGitHub f9c672ffa2 A lesson in testing your PRs (#16969) 2021-10-18 16:15:54 +01:00
AffectedArc07 e843d297bf Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-17 20:49:07 +01:00
variableundefinedandGitHub 9470fd0387 Merge pull request #16889 from AffectedArc07/cui-cdl
Moves CUI entries to CDL
2021-10-17 13:57:14 -05:00
variableundefinedandGitHub 8d4b75690e Merge pull request #16873 from PacifistDalek/ghost-deck-of-cards
Ghosts can no longer shuffle cards
2021-10-17 13:47:26 -05:00
variableundefinedandGitHub 33f408ed02 Merge pull request #16849 from ProfessorDonut/danger-noodle-pai
Snake icon and hissing speech verb for pAI
2021-10-17 13:45:12 -05:00
variableundefinedandGitHub 56003f88ac Merge pull request #16884 from Qwertytoforty/A-simple-mob-problem
Adds a malf AI upgrade for engineering borgs, adds zipties to all emaged borgs.
2021-10-17 13:44:09 -05:00
variableundefinedandGitHub 909521c48d Merge pull request #16886 from Cocacolagua/unbreakable_stride
Replaces clown magboots on the uplink with a new pair of slippers
2021-10-17 13:40:07 -05:00
variableundefinedandGitHub 1531779ebe Merge pull request #16898 from Qwertytoforty/armor-PEN-etration
Adds 20% armour penetration to the edagger
2021-10-17 13:36:29 -05:00
variableundefinedandGitHub 3cc0a652d2 Merge pull request #16916 from Qwertytoforty/deader-chat
Allows wizards to mute dead chat for 2 wizard points.
2021-10-17 13:32:04 -05:00
variableundefinedandGitHub edd1781e38 Merge pull request #16943 from E-MonaRhg/more-carpets
Carpet bomb your station: 8 more carpet types and a carpet cargo crate
2021-10-17 13:30:03 -05:00
variableundefinedandGitHub e65ce685ca Merge pull request #16902 from AffectedArc07/magistrate-hour-lock
Moves magistrate to a 100 security hour lock instead of karma
2021-10-17 13:22:23 -05:00
AffectedArc07 767d8e0841 Fix 2021-10-17 16:37:40 +01:00
AffectedArc07 b105b44bed Lets give this a go 2021-10-17 16:30:19 +01:00
AffectedArc07 d966e5f36c Switch server verb 2021-10-17 16:04:16 +01:00
AffectedArc07 712dcb8904 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-17 15:14:03 +01:00
Qwertytoforty fee76f5b0e localy cached 2021-10-17 10:03:40 -04:00
AffectedArc07 16fe7f6b9a Fixes re-admin not working 2021-10-17 14:56:42 +01:00
PacifistDalek 10e568d937 I was really overthinking this, but thanks AA, this works now 2021-10-17 07:30:09 -04:00
d006c249c3 Sprite tweak for long range and syndie fax machines (#16843)
* cuts down on sprite bloat, recolours faxes

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* more prominent syndie stripe

* long range tweak

* denth tweaks

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-10-17 11:12:14 +01:00
hal9000PRandGitHub 4400bca165 Prevents speed stacking with the DNA vault (#16911)
* speed stacking fix

* makes the speed consistant
2021-10-17 11:10:59 +01:00
SabreMLandGitHub 94a593cbb8 Stacking Machine GC (#16958) 2021-10-17 10:56:56 +01:00
SabreMLandGitHub 8c88446c68 Attack log null prefs fix (#16959) 2021-10-17 10:56:20 +01:00
SabreMLandGitHub 1db94b18f1 White runechat toggle fix (#16949) 2021-10-15 14:10:04 +01:00