Commit Graph
11906 Commits
Author SHA1 Message Date
SabreML 1c14cf733b Light delay V1 2021-08-19 01:19:24 +01:00
Fox McCloudandGitHub 5af76d92cc Merge pull request #16498 from shmabuu/Fake-Blindfold
Adds Fake Blindfold
2021-08-18 16:02:42 -04:00
E-MonaRhg 6e9cd90cfc Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-17 17:45:57 +02:00
E-MonaRhgandGitHub 97996dd4de Just a singular letter letter addition (#16556) 2021-08-16 22:39:45 +01:00
E-MonaRhg 566b246a24 Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-16 21:32:35 +02:00
SabreMLandGitHub d03fc7ea1c Update mapping_helpers.dm (#16538) 2021-08-15 01:18:05 +01:00
073cbcf944 Apply suggestions from code review
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-08-14 18:01:10 +01:00
E-MonaRhg 101551865f Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-08-14 17:42:06 +02:00
variableundefinedandGitHub aa820ab123 Merge pull request #16291 from SabreML/brass
Craftable brass sheets
2021-08-13 23:40:03 -04:00
E-MonaRhg c895e47ccb Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-13 19:26:44 +02:00
SabreMLandGitHub 5cd4e55063 'Unrestricted access from direction' for windoors (#16501)
* Unrestricted Windoor Directions

* Mapping helpers
2021-08-12 13:05:42 +01:00
S34NW 6234346ff0 Revert "Revert "Adds glass floors" (#16524)"
This reverts commit 517f5e8304.
2021-08-11 21:29:00 +01:00
variableundefinedandGitHub 517f5e8304 Revert "Adds glass floors" (#16524) 2021-08-11 21:18:49 +01:00
variableundefinedandGitHub d8bfbe307a Merge pull request #15929 from S34NW/tgglassfloors
Adds glass floors
2021-08-11 16:08:09 -04:00
variableundefinedandGitHub 99e8487bfd Merge pull request #15656 from Qwertytoforty/I-guess-I-port-stuff-now-huh
Adds supermatter sliver steal and plutonium core steal objective from TG
2021-08-11 16:05:24 -04:00
SabreML c161e34a4d Possessed Blade poll 2021-08-11 16:20:59 +01:00
SabreML 1ce82a4dea Sign teleportation
Also a small refactor (Bigger one needed later).
2021-08-11 15:52:23 +01:00
Cocacolagua fa1554a21f no more helmet protection 2021-08-10 10:58:12 -03:00
shmabuu 61330ef44a i do be seeing part 2 2021-08-07 01:36:50 -07:00
S34NW fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01:00
E-MonaRhg ecd50aaf71 Suggested stuff + security bomber jacket and renamed hard hats 2021-08-06 14:50:11 +02:00
9bf4d7ad84 Sets a Mob Cap for Giant Spiders (#15923)
* Counting and Capping for Giant Spider Spawning

* Moves magic numbers into defines

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* Update code/controllers/subsystem/mobs.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* makes requested changes

* I hope to god this fixes this

* implements requested changes

* removes double parent call

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-08-05 21:23:01 +01:00
E-MonaRhg c652bbfa10 Initial departmental clothing vendors commit 2021-08-05 22:01:05 +02:00
S34NW ea87e351a2 Merge branch 'master' into tgglassfloors 2021-08-05 15:17:09 +01:00
hal9000PRandGitHub b2d46ba7bc fix (#16485) 2021-08-05 14:42:33 +01:00
02fe0876f5 Fix bundle #3 (#16411)
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-08-05 11:04:27 +01:00
S34NandGitHub e75d8357eb i touched the intercoms (#16483) 2021-08-05 10:55:17 +01:00
SabreML bb82a58c8f Merge remote-tracking branch 'upstream/master' into brass 2021-08-04 19:32:12 +01:00
S34NW 4aa46f8bf3 stops outline flashing momentarily on dropping 2021-08-04 08:49:29 +01:00
SabreMLandGitHub 3a284ec0b3 One character PR time (#16477) 2021-08-04 02:41:26 -04:00
E-MonaRhgandGitHub 4814d4b29a Fixes the floor painter icon state (#16473) 2021-08-03 00:25:08 +01:00
Farie82andGitHub 398ac7b286 Can't have infinite EMP implant charges anymore (#16469)
* Can't have infinite EMP implant charges anymore
 + Makes the EMP implant call empulse async

* pulse pulse
2021-08-02 13:47:24 +01:00
warior4356andGitHub 72559ddf70 Fixes telekinesis crafting appearing at mob's feet (#16337)
* Fixes TK building in strange places.

* Minor formatting tweaks

* replaces usr.loc
2021-07-30 11:58:09 +01:00
a4ac662ae2 Update code/game/objects/items.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-07-29 08:11:05 +01:00
c45a359769 Grammer and style
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-28 18:21:58 -04:00
S34NW 7a5e343c11 code review 2021-07-28 19:26:43 +01:00
AffectedArc07andGitHub e46f67810a Cleans up the TODOs I left all over the codebase (#16443)
* Removes command_name() proc

* Removes GLOB.teleportlocs + GLOB.ghostteleportlocs

* Clean up IPIntel

* Tweaks karma logging

* Tweaks time
2021-07-28 13:45:18 -04:00
S34NandGitHub d37cbd1ad7 Apply suggestions from code review 2021-07-28 17:15:13 +01:00
S34NW 14bfd19814 Like tracing your hand but for items 2021-07-28 17:04:48 +01:00
Fox McCloudandGitHub 9df0c803cc Merge pull request #16420 from SabreML/fire-nerf
Fire-safety closet extinguisher tweak
2021-07-27 13:11:17 -04:00
E-MonaRhg ee47ea90cb Makes the advanced defib give heart attacks as intended 2021-07-27 19:02:29 +02:00
dearmochi dbab95dd96 Merge branch 'master' into hair-gradients 2021-07-27 18:35:55 +02:00
dearmochi 502258e348 Merge branch 'master' into hair-gradients 2021-07-27 18:28:46 +02:00
dearmochi f5ca8ff9ca Finish the damn PR 2021-07-27 18:15:28 +02:00
E-MonaRhg 51a36cfb9f Makes the advanced defib emaggable + sprite tweaks 2021-07-27 18:11:12 +02:00
E-MonaRhg 4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
variableundefinedandGitHub e788278f57 Merge pull request #16397 from Sirryan2002/ERTFix
Jani ERT Equipment Tweak
2021-07-26 20:37:03 -04:00
variableundefinedandGitHub 838dde54ec Merge pull request #15201 from SabreML/pull-facing
Face towards structures while pulling them
2021-07-26 20:26:44 -04:00
Fox McCloudandGitHub 4dffbd67ed Merge pull request #15139 from SabreML/rainbow-gibs
Species Gib Colours
2021-07-26 15:18:32 -04:00
variableundefinedandGitHub ec7206e612 Merge pull request #15599 from SabreML/flyswatter-fix
Fixes the flyswatter not swatting flies
2021-07-26 13:36:54 -04:00